X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_notice.cpp;h=0aa793cb9070a459826cb854e67bade987b6f6bf;hb=f0a928a2f7de2ebde53dfb6cf25ead86a5e480d8;hp=d6e11a803275a80468d2959be3b9a4a8a3971fab;hpb=ffbd1eebf0b82bf40482879f410f58874030a695;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_notice.cpp b/src/commands/cmd_notice.cpp index d6e11a803..0aa793cb9 100644 --- a/src/commands/cmd_notice.cpp +++ b/src/commands/cmd_notice.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,13 +12,35 @@ */ #include "inspircd.h" -#include "wildcard.h" -#include "commands/cmd_notice.h" - -extern "C" DllExport Command* init_command(InspIRCd* Instance) +/** Handle /NOTICE. These command handlers can be reloaded by the core, + * and handle basic RFC1459 commands. Commands within modules work + * the same way, however, they can be fully unloaded, where these + * may not. + */ +class CommandNotice : public Command { - return new CommandNotice(Instance); -} + public: + /** Constructor for notice. + */ + CommandNotice ( Module* parent) : Command(parent,"NOTICE",2,2) { syntax = "{,} "; } + /** Handle command. + * @param parameters The parameters to the comamnd + * @param pcnt The number of parameters passed to teh command + * @param user The user issuing the command + * @return A value from CmdResult to indicate command success or failure. + */ + CmdResult Handle(const std::vector& parameters, User *user); + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + if (IS_LOCAL(user)) + // This is handled by the OnUserNotice hook to split the LoopCall pieces + return ROUTE_LOCALONLY; + else + return ROUTE_MESSAGE(parameters[0]); + } +}; + CmdResult CommandNotice::Handle (const std::vector& parameters, User *user) { @@ -28,21 +50,24 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use CUList exempt_list; user->idle_lastmsg = ServerInstance->Time(); - - if (ServerInstance->Parser->LoopCall(user, this, parameters, parameters.size(), 0)) + + if (ServerInstance->Parser->LoopCall(user, this, parameters, 0)) return CMD_SUCCESS; - if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server))) + if (parameters[0][0] == '$') { - int MOD_RESULT = 0; + if (!user->HasPrivPermission("users/mass-message")) + return CMD_SUCCESS; + + ModResult MOD_RESULT; std::string temp = parameters[1]; - FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, exempt_list)); - if (MOD_RESULT) + FIRST_MOD_RESULT(OnUserPreNotice, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, exempt_list)); + if (MOD_RESULT == MOD_RES_DENY) return CMD_FAILURE; const char* text = temp.c_str(); const char* servermask = (parameters[0].c_str()) + 1; FOREACH_MOD(I_OnText,OnText(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, exempt_list)); - if (match(ServerInstance->Config->ServerName,servermask)) + if (InspIRCd::Match(ServerInstance->Config->ServerName,servermask, NULL)) { user->SendAll("NOTICE", "%s", text); } @@ -61,7 +86,7 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use { chan = ServerInstance->FindChan(target); - exempt_list[user] = user->nick; + exempt_list.insert(user); if (chan) { @@ -69,27 +94,27 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use { if ((chan->IsModeSet('n')) && (!chan->HasUser(user))) { - user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick, chan->name); + user->WriteNumeric(404, "%s %s :Cannot send to channel (no external messages)", user->nick.c_str(), chan->name.c_str()); return CMD_FAILURE; } - if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE)) + if ((chan->IsModeSet('m')) && (chan->GetPrefixValue(user) < VOICE_VALUE)) { - user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick, chan->name); + user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick.c_str(), chan->name.c_str()); return CMD_FAILURE; } } - int MOD_RESULT = 0; + ModResult MOD_RESULT; std::string temp = parameters[1]; - FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status, exempt_list)); - if (MOD_RESULT) { + FIRST_MOD_RESULT(OnUserPreNotice, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status, exempt_list)); + if (MOD_RESULT == MOD_RES_DENY) return CMD_FAILURE; - } + const char* text = temp.c_str(); if (temp.empty()) { - user->WriteNumeric(412, "%s :No text to send", user->nick); + user->WriteNumeric(412, "%s :No text to send", user->nick.c_str()); return CMD_FAILURE; } @@ -99,16 +124,16 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use { if (ServerInstance->Config->UndernetMsgPrefix) { - chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, text); + chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name.c_str(), status, text); } else { - chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, text); + chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name.c_str(), text); } } else { - chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, text); + chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name.c_str(), text); } FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,text,status,exempt_list)); @@ -116,12 +141,12 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use else { /* no such nick/channel */ - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, target); + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target); return CMD_FAILURE; } return CMD_SUCCESS; } - + const char* destnick = parameters[0].c_str(); if (IS_LOCAL(user)) @@ -130,13 +155,14 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use if (targetserver) { - char nickonly[NICKMAX+1]; - strlcpy(nickonly, destnick, targetserver - destnick + 1); + std::string nickonly; + + nickonly.assign(destnick, 0, targetserver - destnick); dest = ServerInstance->FindNickOnly(nickonly); - if (dest && strcasecmp(dest->server, targetserver + 1)) + if (dest && strcasecmp(dest->server.c_str(), targetserver + 1)) { /* Incorrect server for user */ - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0].c_str()); + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } } @@ -150,14 +176,14 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use { if (parameters[1].empty()) { - user->WriteNumeric(412, "%s :No text to send", user->nick); + user->WriteNumeric(412, "%s :No text to send", user->nick.c_str()); return CMD_FAILURE; } - int MOD_RESULT = 0; + ModResult MOD_RESULT; std::string temp = parameters[1]; - FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0,exempt_list)); - if (MOD_RESULT) { + FIRST_MOD_RESULT(OnUserPreNotice, MOD_RESULT, (user,dest,TYPE_USER,temp,0,exempt_list)); + if (MOD_RESULT == MOD_RES_DENY) { return CMD_FAILURE; } const char* text = temp.c_str(); @@ -167,7 +193,7 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use if (IS_LOCAL(dest)) { // direct write, same server - user->WriteTo(dest, "NOTICE %s :%s", dest->nick, text); + user->WriteTo(dest, "NOTICE %s :%s", dest->nick.c_str(), text); } FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,text,0,exempt_list)); @@ -175,7 +201,7 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use else { /* no such nick/channel */ - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0].c_str()); + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } @@ -183,3 +209,4 @@ CmdResult CommandNotice::Handle (const std::vector& parameters, Use } +COMMAND_INIT(CommandNotice)