From fcf104f0ca168bff1a60da9247e2ef7cbe15fbaf Mon Sep 17 00:00:00 2001 From: Adam- Date: Wed, 16 Sep 2009 23:31:43 +0000 Subject: [PATCH] Really not send unknown command messages on non-fantasy commands git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2508 5417fbe8-f217-4b02-8779-1006273d7864 --- src/botserv.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/src/botserv.c b/src/botserv.c index 48dc848ed..3fc4c5c11 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -428,31 +428,29 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) if (check_access(u, ci, CA_FANTASIA)) { - if ((command = findCommand(CHANSERV, cmd))) + command = findCommand(CHANSERV, cmd); + + /* Command exists and can not be called by fantasy */ + if (command && !command->HasFlag(CFLAG_DISABLE_FANTASY)) { - /* Command exists but can not be called by fantasy */ - if (command->HasFlag(CFLAG_DISABLE_FANTASY)) - notice_lang(s_ChanServ, u, UNKNOWN_COMMAND_HELP, cmd, s_ChanServ); - else + bbuf = std::string(cmd); + + /* Some commands don't need the channel name added.. eg !help */ + if (!command->HasFlag(CFLAG_STRIP_CHANNEL)) { - bbuf = std::string(cmd); - - /* Some commands don't need the channel name added.. eg !help */ - if (!command->HasFlag(CFLAG_STRIP_CHANNEL)) - { - bbuf += " "; - bbuf += ci->name; - } - - if (params) - { - bbuf += " "; - bbuf += params; - } - - chanserv(u, const_cast(bbuf.c_str())); // XXX Unsafe cast, this needs reviewing -- CyberBotX + bbuf += " "; + bbuf += ci->name; } + + if (params) + { + bbuf += " "; + bbuf += params; + } + + chanserv(u, const_cast(bbuf.c_str())); // XXX Unsafe cast, this needs reviewing -- CyberBotX } + FOREACH_MOD(I_OnBotFantasy, OnBotFantasy(cmd, u, ci, params)); } else