Start converting stuff that sends to server to use BotInfo, as everything is now a BotInfo struct, instead of craqy struct Uid stuff. INCOMPLETE. Also, create a derived IRCdProtoTS6 class, to save repeating ourselves X million times.

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

2 files changed, 1 insertions, 34 deletions

diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 3a714a2f7..62f2574e0 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -434,29 +434,6 @@ CUMode myCumodes[128] = {
     {0}, {0}, {0}, {0}, {0}
 };
 
-
-
-void CharybdisProto::cmd_message(const char *source, const char *dest, const char *buf)
-{
-	if (!buf) return;
-	if (NSDefFlags & NI_MSG) cmd_privmsg(source, dest, buf);
-	else cmd_notice(source, dest, buf);
-}
-
-void CharybdisProto::cmd_notice(const char *source, const char *dest, const char *msg)
-{
-	Uid *ud = find_uid(source);
-	User *u = finduser(dest);
-	send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "NOTICE %s :%s", UseTS6 ? (u ? u->uid : dest) : dest, msg);
-}
-
-void CharybdisProto::cmd_privmsg(const char *source, const char *dest, const char *buf)
-{
-	if (!buf) return;
-	Uid *ud = find_uid(source), *ud2 = find_uid(dest);
-	send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "PRIVMSG %s :%s", UseTS6 ? (ud2 ? ud2->uid : dest) : dest, buf);
-}
-
 void CharybdisProto::cmd_global(const char *source, const char *buf)
 {
 	if (!buf) return;
@@ -758,12 +735,6 @@ void CharybdisProto::cmd_remove_akill(const char *user, const char *host)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNKLINE * %s %s", user, host);
 }
 
-void CharybdisProto::cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
-{
-	Uid *ud = find_uid(whosets);
-	send_cmd(UseTS6 ? (ud ? ud->uid : whosets) : whosets, "TOPIC %s :%s", chan, topic);
-}
-
 void CharybdisProto::cmd_vhost_off(User *u)
 {
 	send_cmd(UseTS6 ? TS6SID : ServerName, "ENCAP * CHGHOST %s :%s", u->nick, u->host);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index f5754accb..2e85b0c3c 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -46,10 +46,9 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t
 
 
-class CharybdisProto : public IRCDProto {
+class CharybdisProto : public IRCDTS6Proto {
 	public:
 		void cmd_remove_akill(const char *, const char *);
-		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void cmd_vhost_off(User *);
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void cmd_svskill(const char *, const char *, const char *);
@@ -58,9 +57,6 @@ class CharybdisProto : public IRCDProto {
 		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 *);
 		void cmd_notice_ops(const char *, const char *, const char *);
-		void cmd_message(const char *, const char *, const char *);
-		void cmd_notice(const char *, const char *, const char *);
-		void cmd_privmsg(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_quit(const char *, const char *);
 		void cmd_pong(const char *, const char *);