diff options
Diffstat (limited to 'src/protocol/charybdis.c')
| -rw-r--r-- | src/protocol/charybdis.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index ac3072b7d..f54f4b901 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -455,22 +455,14 @@ void CharybdisProto::cmd_message(const char *source, const char *dest, const cha { if (!buf) return; if (NSDefFlags & NI_MSG) cmd_privmsg(source, dest, buf); - else { - 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, buf); - } + else cmd_notice(source, dest, buf); } void charybdis_cmd_notice2(const char *source, const char *dest, const char *msg) { - Uid *ud; - User *u; - - ud = find_uid(source); - u = finduser(dest); - send_cmd((UseTS6 ? (ud ? ud->uid : source) : source), "NOTICE %s :%s", - (UseTS6 ? (u ? u->uid : dest) : dest), 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) @@ -1759,7 +1751,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_notice2(charybdis_cmd_notice2); pmodule_cmd_serv_notice(charybdis_cmd_serv_notice); pmodule_cmd_serv_privmsg(charybdis_cmd_serv_privmsg); pmodule_cmd_bot_chan_mode(charybdis_cmd_bot_chan_mode); |