diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/extern.h | 3 | ||||
| -rw-r--r-- | include/services.h | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/extern.h b/include/extern.h index 95cd9e382..0cc3f72c1 100644 --- a/include/extern.h +++ b/include/extern.h @@ -611,7 +611,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_notice(void (*func) (const char *source, const char *dest, const char *buf)); E void pmodule_cmd_notice2(void (*func) (const char *source, const char *dest, const char *msg)); E void pmodule_cmd_serv_notice(void (*func) (const char *source, const char *dest, const char *msg)); E void pmodule_cmd_serv_privmsg(void (*func) (const char *source, const char *dest, const char *msg)); @@ -1220,7 +1219,7 @@ E void anope_cmd_nick(const char *nick, const char *name, const char *mode); 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 */ -E void anope_cmd_notice(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */ +E void anope_cmd_message(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */ E void anope_cmd_notice_ops(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */ E void anope_cmd_notice2(const char *source, const char *dest, const char *msg); /* NOTICE */ E void anope_cmd_serv_notice(const char *source, const char *dest, const char *msg); /* NOTICE */ diff --git a/include/services.h b/include/services.h index c868c6d5a..61b967b64 100644 --- a/include/services.h +++ b/include/services.h @@ -1059,7 +1059,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_notice)(const char *source, const char *dest, const char *buf); void (*ircd_cmd_notice2)(const char *source, const char *dest, const char *msg); void (*ircd_cmd_serv_notice)(const char *source, const char *dest, const char *msg); void (*ircd_cmd_serv_privmsg)(const char *source, const char *dest, const char *msg); @@ -1306,6 +1305,12 @@ class IRCDProtoNew { virtual void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *) = 0; virtual void cmd_kick(const char *source, const char *chan, const char *user, const char *buf) = 0; virtual void cmd_notice_ops(const char *, const char *dest, const char *buf) = 0; + virtual void cmd_message(const char *source, const char *dest, const char *buf) + { + if (!buf || !dest) return; + if (NSDefFlags & NI_MSG) cmd_privmsg(source, dest, buf); + else send_cmd(source, "NOTICE %s :%s", dest, buf); + } virtual void cmd_privmsg(const char *source, const char *dest, const char *buf) { if (!buf || !dest) return; |