summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/extern.h1
-rw-r--r--include/services.h2
-rw-r--r--src/ircd.c8
-rw-r--r--src/protocol/bahamut.c5
-rw-r--r--src/protocol/bahamut.h2
-rw-r--r--src/protocol/charybdis.c17
-rw-r--r--src/protocol/charybdis.h2
-rw-r--r--src/protocol/inspircd11.c5
-rwxr-xr-xsrc/protocol/inspircd11.h2
-rw-r--r--src/protocol/ratbox.c17
-rw-r--r--src/protocol/ratbox.h2
-rw-r--r--src/protocol/unreal32.c6
-rw-r--r--src/protocol/unreal32.h2
13 files changed, 25 insertions, 46 deletions
diff --git a/include/extern.h b/include/extern.h
index 6e56befe4..374ac9918 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -610,7 +610,6 @@ E void pmodule_cmd_372(void (*func) (const char *source, const char *msg));
E void pmodule_cmd_372_error(void (*func) (const char *source));
E void pmodule_cmd_375(void (*func) (const char *source));
E void pmodule_cmd_376(void (*func) (const char *source));
-E void pmodule_cmd_bot_chan_mode(void (*func) (const char *nick, const char *chan));
E void pmodule_cmd_351(void (*func) (const char *source));
E void pmodule_cmd_quit(void (*func) (const char *source, const char *buf));
E void pmodule_cmd_pong(void (*func) (const char *servname, const char *who));
diff --git a/include/services.h b/include/services.h
index c60d6cbd0..cc1ed7175 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1060,7 +1060,6 @@ typedef struct ircd_proto_ {
void (*ircd_cmd_372_error)(const char *source);
void (*ircd_cmd_375)(const char *source);
void (*ircd_cmd_376)(const char *source);
- void (*ircd_cmd_bot_chan_mode)(const char *nick, const char *chan);
void (*ircd_cmd_351)(const char *source);
void (*ircd_cmd_quit)(const char *source, const char *buf);
void (*ircd_cmd_pong)(const char *servname, const char *who);
@@ -1326,6 +1325,7 @@ class IRCDProtoNew {
{
send_cmd(source, "PRIVMSG %s%s :%s", ircd->globaltldprefix, dest, msg);
}
+ virtual void cmd_bot_chan_mode(const char *, const char *) = 0;
};
/*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index e4523d94b..a812164ea 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -50,7 +50,6 @@ void initIrcdProto()
ircdproto.ircd_cmd_372_error = NULL;
ircdproto.ircd_cmd_375 = NULL;
ircdproto.ircd_cmd_376 = NULL;
- ircdproto.ircd_cmd_bot_chan_mode = NULL;
ircdproto.ircd_cmd_351 = NULL;
ircdproto.ircd_cmd_quit = NULL;
ircdproto.ircd_cmd_pong = NULL;
@@ -286,7 +285,7 @@ void anope_cmd_serv_privmsg(const char *source, const char *dest, const char *ms
void anope_cmd_bot_chan_mode(const char *nick, const char *chan)
{
- ircdproto.ircd_cmd_bot_chan_mode(nick, chan);
+ ircdprotonew->cmd_bot_chan_mode(nick, chan);
}
void anope_cmd_351(const char *source)
@@ -659,11 +658,6 @@ void pmodule_cmd_376(void (*func) (const char *source))
ircdproto.ircd_cmd_376 = func;
}
-void pmodule_cmd_bot_chan_mode(void (*func) (const char *nick, const char *chan))
-{
- ircdproto.ircd_cmd_bot_chan_mode = func;
-}
-
void pmodule_cmd_351(void (*func) (const char *source))
{
ircdproto.ircd_cmd_351 = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 35eb9fc42..35d1fb61d 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -510,9 +510,9 @@ void bahamut_cmd_svsmode_chan(const char *name, const char *mode, const char *ni
}
}
-void bahamut_cmd_bot_chan_mode(const char *nick, const char *chan)
+void BahamutIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
- anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
+ anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
/* EVENT: SJOIN */
@@ -1488,7 +1488,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(bahamut_cmd_372_error);
pmodule_cmd_375(bahamut_cmd_375);
pmodule_cmd_376(bahamut_cmd_376);
- pmodule_cmd_bot_chan_mode(bahamut_cmd_bot_chan_mode);
pmodule_cmd_351(bahamut_cmd_351);
pmodule_cmd_quit(bahamut_cmd_quit);
pmodule_cmd_pong(bahamut_cmd_pong);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 99ad68600..d5cc2bb75 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -63,7 +63,6 @@ void bahamut_cmd_372(const char *source, const char *msg);
void bahamut_cmd_372_error(const char *source);
void bahamut_cmd_375(const char *source);
void bahamut_cmd_376(const char *source);
-void bahamut_cmd_bot_chan_mode(const char *nick, const char *chan);
void bahamut_cmd_351(const char *source);
void bahamut_cmd_quit(const char *source, const char *buf);
void bahamut_cmd_pong(const char *servname, const char *who);
@@ -123,4 +122,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
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_bot_chan_mode(const char *, const char *);
} ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index a509aacea..4b04324e7 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1335,17 +1335,13 @@ void CharybdisProto::cmd_notice_ops(const char *source, const char *dest, const
send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "NOTICE @%s :%s", dest, buf);
}
-void charybdis_cmd_bot_chan_mode(const char *nick, const char *chan)
+void CharybdisProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
- Uid *u;
-
- if (UseTS6) {
- u = find_uid(nick);
- charybdis_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode,
- (u ? u->uid : nick));
- } else {
- anope_cmd_mode(ServerName, chan, "%s %s", ircd->botchanumode, nick);
- }
+ if (UseTS6) {
+ Uid *u = find_uid(nick);
+ charybdis_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode, u ? u->uid : nick);
+ }
+ else anope_cmd_mode(ServerName, chan, "%s %s", ircd->botchanumode, nick);
}
/* QUIT */
@@ -1741,7 +1737,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(charybdis_cmd_372_error);
pmodule_cmd_375(charybdis_cmd_375);
pmodule_cmd_376(charybdis_cmd_376);
- pmodule_cmd_bot_chan_mode(charybdis_cmd_bot_chan_mode);
pmodule_cmd_351(charybdis_cmd_351);
pmodule_cmd_quit(charybdis_cmd_quit);
pmodule_cmd_pong(charybdis_cmd_pong);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index fb88eb98d..643b8f0ff 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -51,7 +51,6 @@ void charybdis_cmd_372(const char *source, const char *msg);
void charybdis_cmd_372_error(const char *source);
void charybdis_cmd_375(const char *source);
void charybdis_cmd_376(const char *source);
-void charybdis_cmd_bot_chan_mode(const char *nick, const char *chan);
void charybdis_cmd_351(const char *source);
void charybdis_cmd_quit(const char *source, const char *buf);
void charybdis_cmd_pong(const char *servname, const char *who);
@@ -113,4 +112,5 @@ class CharybdisProto : public IRCDProtoNew {
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 *);
} ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index a8347d457..c8b691e2e 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -780,9 +780,9 @@ void InspIRCdProto::cmd_notice_ops(const char *source, const char *dest, const c
send_cmd(ServerName, "NOTICE @%s :%s", dest, buf);
}
-void inspircd_cmd_bot_chan_mode(const char *nick, const char *chan)
+void InspIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
- anope_cmd_mode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
+ anope_cmd_mode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
}
void inspircd_cmd_351(const char *source)
@@ -1734,7 +1734,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(inspircd_cmd_372_error);
pmodule_cmd_375(inspircd_cmd_375);
pmodule_cmd_376(inspircd_cmd_376);
- pmodule_cmd_bot_chan_mode(inspircd_cmd_bot_chan_mode);
pmodule_cmd_351(inspircd_cmd_351);
pmodule_cmd_quit(inspircd_cmd_quit);
pmodule_cmd_pong(inspircd_cmd_pong);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 6343bb711..59551d6f1 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -56,7 +56,6 @@ void inspircd_cmd_372(const char *source, const char *msg);
void inspircd_cmd_372_error(const char *source);
void inspircd_cmd_375(const char *source);
void inspircd_cmd_376(const char *source);
-void inspircd_cmd_bot_chan_mode(const char *nick, const char *chan);
void inspircd_cmd_351(const char *source);
void inspircd_cmd_quit(const char *source, const char *buf);
void inspircd_cmd_pong(const char *servname, const char *who);
@@ -127,4 +126,5 @@ class InspIRCdProto : public IRCDProtoNew {
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_bot_chan_mode(const char *, const char *);
} ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index f5d9dcfe1..a8cdc7629 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1267,17 +1267,13 @@ void RatboxProto::cmd_notice_ops(const char *source, const char *dest, const cha
send_cmd(NULL, "NOTICE @%s :%s", dest, buf);
}
-void ratbox_cmd_bot_chan_mode(const char *nick, const char *chan)
+void RatboxProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
- Uid *u;
-
- if (UseTS6) {
- u = find_uid(nick);
- ratbox_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode,
- (u ? u->uid : nick));
- } else {
- anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
- }
+ if (UseTS6) {
+ Uid *u = find_uid(nick);
+ ratbox_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode, u ? u->uid : nick);
+ }
+ else anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
}
/* QUIT */
@@ -1635,7 +1631,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(ratbox_cmd_372_error);
pmodule_cmd_375(ratbox_cmd_375);
pmodule_cmd_376(ratbox_cmd_376);
- pmodule_cmd_bot_chan_mode(ratbox_cmd_bot_chan_mode);
pmodule_cmd_351(ratbox_cmd_351);
pmodule_cmd_quit(ratbox_cmd_quit);
pmodule_cmd_pong(ratbox_cmd_pong);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 21f205184..98530eb6f 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -50,7 +50,6 @@ void ratbox_cmd_372(const char *source, const char *msg);
void ratbox_cmd_372_error(const char *source);
void ratbox_cmd_375(const char *source);
void ratbox_cmd_376(const char *source);
-void ratbox_cmd_bot_chan_mode(const char *nick, const char *chan);
void ratbox_cmd_351(const char *source);
void ratbox_cmd_quit(const char *source, const char *buf);
void ratbox_cmd_pong(const char *servname, const char *who);
@@ -111,4 +110,5 @@ class RatboxProto : public IRCDProtoNew {
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 *);
} ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 8879aea15..da5142fdf 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -630,10 +630,9 @@ void UnrealIRCdProto::cmd_notice_ops(const char *source, const char *dest, const
}
-void unreal_cmd_bot_chan_mode(const char *nick, const char *chan)
+void UnrealIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
{
- anope_cmd_mode(nick, chan, "%s %s %s", myIrcd->botchanumode, nick,
- nick);
+ anope_cmd_mode(nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
}
void unreal_cmd_351(const char *source)
@@ -2036,7 +2035,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_372_error(unreal_cmd_372_error);
pmodule_cmd_375(unreal_cmd_375);
pmodule_cmd_376(unreal_cmd_376);
- pmodule_cmd_bot_chan_mode(unreal_cmd_bot_chan_mode);
pmodule_cmd_351(unreal_cmd_351);
pmodule_cmd_quit(unreal_cmd_quit);
pmodule_cmd_pong(unreal_cmd_pong);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 0770da420..1b5e168d3 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -85,7 +85,6 @@ void unreal_cmd_372(const char *source, const char *msg);
void unreal_cmd_372_error(const char *source);
void unreal_cmd_375(const char *source);
void unreal_cmd_376(const char *source);
-void unreal_cmd_bot_chan_mode(const char *nick, const char *chan);
void unreal_cmd_351(const char *source);
void unreal_cmd_quit(const char *source, const char *buf);
void unreal_cmd_pong(const char *servname, const char *who);
@@ -146,4 +145,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
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_bot_chan_mode(const char *, const char *);
} ircd_proto;
generated by cgit (git 2.34.1) at 2025-06-20 18:25:22 +0000