Remove cmd_nick in favour of cmd_bot_nick.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1275 5417fbe8-f217-4b02-8779-1006273d7864

14 files changed, 10 insertions, 79 deletions

diff --git a/include/extern.h b/include/extern.h
index 2881b88ec..b28e3dda5 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1178,7 +1178,6 @@ E void anope_cmd_tmode(const char *source, const char *dest, const char *fmt, ..
 E void anope_cmd_unban(const char *name, const char *nick);				  		  			      /* MODE -b */
 E void anope_cmd_bot_chan_mode(const char *nick, const char *chan);			  		  /* MODE BotServ */
 E void anope_cmd_netinfo(int ac, const char **av);						  /* NETINFO */
-E void anope_cmd_nick(const char *nick, const char *name, const char *mode);			  		  /* NICK */
 E void anope_cmd_chg_nick(const char *oldnick, const char *newnick);             	  		  /* NICK */
 E void anope_cmd_bot_nick(const char *nick, const char *user,const char *host,const char *real,const char *modes);	  /* NICK */
 E void anope_cmd_guest_nick(const char *nick, const char *user,const char *host,const char *real,const char *modes);	  /* NICK */
diff --git a/include/services.h b/include/services.h
index a62b8d849..790fadafc 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1275,7 +1275,6 @@ class IRCDProtoNew {
 		virtual void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
 		virtual void cmd_svskill(const char *, const char *, const char *) = 0;
 		virtual void cmd_svsmode(User *, int, const char **) = 0;
-		virtual void cmd_nick(const char *, const char *, const char *) = 0;
 		virtual void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *) { }
 		virtual void cmd_mode(const char *, const char *, const char *) = 0;
 		virtual void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *) = 0;
diff --git a/src/init.c b/src/init.c
index c06428cdf..5af4ddf97 100644
--- a/src/init.c
+++ b/src/init.c
@@ -32,51 +32,41 @@ void introduce_user(const char *user)
     memmove(lasttimes, lasttimes + 1, sizeof(lasttimes) - sizeof(int));
     lasttimes[LTSIZE - 1] = time(NULL);
 #undef LTSIZE
-
     /* We make aliases go online */
     if (s_NickServAlias && (!user || stricmp(user, s_NickServAlias) == 0)) {
-        anope_cmd_nick(s_NickServAlias, desc_NickServAlias,
-                       ircd->nickservaliasmode);
+        anope_cmd_bot_nick(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode);
     }
 
     if (s_ChanServAlias && (!user || stricmp(user, s_ChanServAlias) == 0)) {
-        anope_cmd_nick(s_ChanServAlias, desc_ChanServAlias,
-                       ircd->chanservaliasmode);
+        anope_cmd_bot_nick(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode);
     }
 
     if (s_MemoServAlias && (!user || stricmp(user, s_MemoServAlias) == 0)) {
-        anope_cmd_nick(s_MemoServAlias, desc_MemoServAlias,
-                       ircd->memoservaliasmode);
+        anope_cmd_bot_nick(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode);
     }
 
     if (s_BotServAlias && (!user || stricmp(user, s_BotServAlias) == 0)) {
-        anope_cmd_nick(s_BotServAlias, desc_BotServAlias,
-                       ircd->botservaliasmode);
+        anope_cmd_bot_nick(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode);
     }
 
     if (s_HelpServAlias && (!user || stricmp(user, s_HelpServAlias) == 0)) {
-        anope_cmd_nick(s_HelpServAlias, desc_HelpServAlias,
-                       ircd->helpservaliasmode);
+        anope_cmd_bot_nick(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode);
     }
 
     if (s_OperServAlias && (!user || stricmp(user, s_OperServAlias) == 0)) {
-        anope_cmd_nick(s_OperServAlias, desc_OperServAlias,
-                       ircd->operservaliasmode);
+        anope_cmd_bot_nick(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode);
     }
 
     if (s_DevNullAlias && (!user || stricmp(user, s_DevNullAlias) == 0)) {
-        anope_cmd_nick(s_DevNullAlias, desc_DevNullAlias,
-                       ircd->devnullvaliasmode);
+        anope_cmd_bot_nick(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode);
     }
     if (s_HostServAlias && ircd->vhost
         && (!user || stricmp(user, s_HostServAlias) == 0)) {
-        anope_cmd_nick(s_HostServAlias, desc_HostServAlias,
-                       ircd->hostservaliasmode);
+        anope_cmd_bot_nick(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode);
     }
     if (s_GlobalNoticerAlias
         && (!user || stricmp(user, s_GlobalNoticerAlias) == 0)) {
-        anope_cmd_nick(s_GlobalNoticerAlias, desc_GlobalNoticerAlias,
-                       ircd->globalaliasmode);
+        anope_cmd_bot_nick(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode);
     }
 
     /* We make the bots go online */
diff --git a/src/ircd.c b/src/ircd.c
index 11eb32293..1aac8ecf1 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -146,11 +146,6 @@ void anope_cmd_376(const char *source)
     ircdproto.ircd_cmd_376(source);
 }
 
-void anope_cmd_nick(const char *nick, const char *name, const char *modes)
-{
-	ircdprotonew->cmd_nick(nick, name, modes);
-}
-
 void anope_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	ircdprotonew->cmd_guest_nick(nick, user, host, real, modes);
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 5a751fd73..d2e4b666a 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1106,13 +1106,6 @@ void bahamut_cmd_211(const char *buf)
     send_cmd(NULL, "211 %s", buf);
 }
 
-void BahamutIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
-{
-	EnforceQlinedNick(nick, NULL);
-	send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, ServiceUser, ServiceHost, ServerName, name);
-	cmd_sqline(nick, "Reserved for services");
-}
-
 void BahamutIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	if (buf) send_cmd(source, "KICK %s %s :%s", chan, user, buf);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 82cbf560e..bc470fc7a 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -87,7 +87,6 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void cmd_svskill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);
-		void cmd_nick(const char *, const char *, const char *);
 		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_mode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 63fe12577..6ee8b8793 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1256,18 +1256,6 @@ void charybdis_cmd_tmode(const char *source, const char *dest, const char *fmt,
     send_cmd(NULL, "MODE %s %s", dest, buf);
 }
 
-void CharybdisProto::cmd_nick(const char *nick, const char *name, const char *mode)
-{
-	EnforceQlinedNick(nick, NULL);
-	if (UseTS6) {
-		char *uidbuf = ts6_uid_retrieve();
-		send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, uidbuf, name);
-		new_uid(nick, uidbuf);
-	}
-	else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
-	cmd_sqline(nick, "Reserved for services");
-}
-
 void CharybdisProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	Uid *ud = find_uid(source);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 987489ac8..c2e276e25 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -75,7 +75,6 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void cmd_svskill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);
-		void cmd_nick(const char *, const char *, const char *);
 		void cmd_mode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_kick(const char *, const char *, const char *, const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 9bbe41d6d..a0bbcb12c 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -603,14 +603,6 @@ void inspircd_cmd_376(const char *source)
     send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
 }
 
-void InspIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
-{
-	/* :test.chatspike.net NICK 1133519355 Brain synapse.brainbox.winbot.co.uk netadmin.chatspike.net ~brain +xwsioS 10.0.0.2 :Craig Edwards */
-	send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, ServiceHost, ServiceHost, ServiceUser, modes, name);
-	/* Don't send ServerName as the source here... -GD */
-	send_cmd(nick, "OPERTYPE Service");
-}
-
 void InspIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
@@ -765,7 +757,7 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
 void InspIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
-	send_cmd(nick, "OPERTYPE Bot");
+	send_cmd(nick, "OPERTYPE Service");
 }
 
 void InspIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 345f70640..11ece0177 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -91,7 +91,6 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void cmd_svskill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);
-		void cmd_nick(const char *, const char *, const char *);
 		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_mode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index b1e4d41d5..879a3f2e8 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1184,18 +1184,6 @@ void ratbox_cmd_tmode(const char *source, const char *dest, const char *fmt, ...
     send_cmd(NULL, "MODE %s %s", dest, buf);
 }
 
-void RatboxProto::cmd_nick(const char *nick, const char *name, const char *mode)
-{
-	EnforceQlinedNick(nick, NULL);
-	if (UseTS6) {
-		char *uidbuf = ts6_uid_retrieve();
-		send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, uidbuf, name);
-		new_uid(nick, uidbuf);
-	}
-	else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
-	cmd_sqline(nick, "Reserved for services");
-}
-
 void RatboxProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	Uid *ud = find_uid(source);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index d86c037a5..34d65e812 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -73,7 +73,6 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void cmd_svskill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);
-		void cmd_nick(const char *, const char *, const char *);
 		void cmd_mode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_kick(const char *, const char *, const char *, const char *);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 56b5f3e90..8a0422b08 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -589,14 +589,6 @@ void unreal_cmd_376(const char *source)
     send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
 }
 
-void UnrealIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
-{
-	EnforceQlinedNick(nick, NULL);
-	send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), ServiceUser, ServiceHost, ServerName, modes,
-		ServiceHost, myIrcd->nickip ? " *" : " ", name);
-	cmd_sqline(nick, "Reserved for services");
-}
-
 void UnrealIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host,
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index dc08bad0d..b094a3ece 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -110,7 +110,6 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void cmd_svskill(const char *, const char *, const char *);
 		void cmd_svsmode(User *, int, const char **);
-		void cmd_nick(const char *, const char *, const char *);
 		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_mode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);