diff options
Diffstat (limited to 'src/protocol/ratbox.c')
| -rw-r--r-- | src/protocol/ratbox.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index beba9aade..5f87057f3 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -444,22 +444,14 @@ void RatboxProto::cmd_message(const char *source, const char *dest, const char * { 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 ratbox_cmd_notice2(const char *source, const char *dest, const char *msg) +void RatboxProto::cmd_notice(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 RatboxProto::cmd_privmsg(const char *source, const char *dest, const char *buf) @@ -1653,7 +1645,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_notice2(ratbox_cmd_notice2); pmodule_cmd_serv_notice(ratbox_cmd_serv_notice); pmodule_cmd_serv_privmsg(ratbox_cmd_serv_privmsg); pmodule_cmd_bot_chan_mode(ratbox_cmd_bot_chan_mode); |