Update m_cloaking to use free-form keys instead of weakening the hash IV

[user/henk/code/inspircd.git] / src / commands / cmd_notice.cpp

diff --git a/src/commands/cmd_notice.cpp b/src/commands/cmd_notice.cpp
index 13ffd6c752ccf020a4f89b0459526a29ed5559b9..ae1f6d83b0bae89bbcb2d92729b3b3c31935170b 100644 (file)
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -12,12 +12,35 @@
  */
 
 #include "inspircd.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 = "<target>{,<target>} <message>"; }
+       /** 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<std::string>& parameters, User *user);
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& 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<std::string>& parameters, User *user)
 {
@@ -35,10 +58,10 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                if (!user->HasPrivPermission("users/mass-message"))
                        return CMD_SUCCESS;
 
-               int MOD_RESULT = 0;
+               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;
@@ -63,7 +86,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
        {
                chan = ServerInstance->FindChan(target);
 
-               exempt_list[user] = user->nick;
+               exempt_list.insert(user);
 
                if (chan)
                {
@@ -74,19 +97,19 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                                        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.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())
@@ -136,7 +159,7 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
 
                        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.c_str(), parameters[0].c_str());
@@ -157,10 +180,10 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
                        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();
@@ -185,3 +208,5 @@ CmdResult CommandNotice::Handle (const std::vector<std::string>& parameters, Use
        return CMD_SUCCESS;
 
 }
+
+COMMAND_INIT(CommandNotice)