Remove InspIRCd* parameters and fields

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

diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index 5c6e462c8b767c90ece309d94eccbfb6b16f6748..0eacfd0bcc31d8663f8b99609c42e714bd8344e2 100644 (file)
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -12,12 +12,26 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_privmsg.h"
 
-extern "C" DllExport  Command* init_command(InspIRCd* Instance)
+/** Handle /PRIVMSG. 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 CommandPrivmsg : public Command
 {
-       return new CommandPrivmsg(Instance);
-}
+ public:
+       /** Constructor for privmsg.
+        */
+       CommandPrivmsg ( Module* parent) : Command(parent,"PRIVMSG",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);
+};
 
 CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, User *user)
 {
@@ -35,10 +49,10 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                if (!user->HasPrivPermission("users/mass-message"))
                        return CMD_SUCCESS;
 
-               int MOD_RESULT = 0;
+               ModResult MOD_RESULT;
                std::string temp = parameters[1];
-               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
-               if (MOD_RESULT)
+               FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
+               if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
 
                const char* text = temp.c_str();
@@ -64,11 +78,11 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        {
                chan = ServerInstance->FindChan(target);
 
-               except_list[user] = user->nick;
+               except_list.insert(user);
 
                if (chan)
                {
-                       if (IS_LOCAL(user) && chan->GetStatus(user) < STATUS_VOICE)
+                       if (IS_LOCAL(user) && chan->GetPrefixValue(user) < VOICE_VALUE)
                        {
                                if (chan->IsModeSet('n') && !chan->HasUser(user))
                                {
@@ -91,13 +105,13 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                                        }
                                }
                        }
-                       int MOD_RESULT = 0;
+                       ModResult MOD_RESULT;
 
                        std::string temp = parameters[1];
-                       FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,chan,TYPE_CHANNEL,temp,status,except_list));
-                       if (MOD_RESULT) {
+                       FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status,except_list));
+                       if (MOD_RESULT == MOD_RES_DENY)
                                return CMD_FAILURE;
-                       }
+
                        const char* text = temp.c_str();
 
                        /* Check again, a module may have zapped the input string */
@@ -175,13 +189,13 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        user->WriteNumeric(301, "%s %s :%s", user->nick.c_str(), dest->nick.c_str(), dest->awaymsg.c_str());
                }
 
-               int MOD_RESULT = 0;
+               ModResult MOD_RESULT;
 
                std::string temp = parameters[1];
-               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user, dest, TYPE_USER, temp, 0, except_list));
-               if (MOD_RESULT) {
+               FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, dest, TYPE_USER, temp, 0, except_list));
+               if (MOD_RESULT == MOD_RES_DENY)
                        return CMD_FAILURE;
-               }
+
                const char* text = temp.c_str();
 
                FOREACH_MOD(I_OnText,OnText(user, dest, TYPE_USER, text, 0, except_list));
@@ -202,3 +216,5 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        }
        return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandPrivmsg)