Membership* changes

[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 a11e53dfb89c9a6ce53d59393c0117aaf40a839c..e05366fa059cd8a32c71165bd21ba1efc4e0da8b 100644 (file)
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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 (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"PRIVMSG",0,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)
 {
@@ -26,7 +40,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        CUList except_list;
 
        user->idle_lastmsg = ServerInstance->Time();
-       
+
        if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
                return CMD_SUCCESS;
 
@@ -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(ServerInstance, 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(ServerInstance, 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 */
@@ -120,7 +134,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                                        chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name.c_str(), text);
                                }
                        }
-                       else 
+                       else
                        {
                                chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name.c_str(), text);
                        }
@@ -141,12 +155,12 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        if (IS_LOCAL(user))
        {
                const char* targetserver = strchr(destnick, '@');
-       
+
                if (targetserver)
                {
                        std::string nickonly;
 
-                       nickonly.assign(destnick, 0, targetserver - destnick + 1);
+                       nickonly.assign(destnick, 0, targetserver - destnick);
                        dest = ServerInstance->FindNickOnly(nickonly);
                        if (dest && strcasecmp(dest->server, targetserver + 1))
                        {
@@ -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(ServerInstance, 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));
@@ -203,3 +217,4 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        return CMD_SUCCESS;
 }
 
+COMMAND_INIT(CommandPrivmsg)