Change OnHookUserIO to OnHookIO, making it usable for more than User* and less picky...

[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 1c4ba277ea1576f11ef35186300778a26a98de85..5c6e462c8b767c90ece309d94eccbfb6b16f6748 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,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "commands/cmd_privmsg.h"
 
 extern "C" DllExport  Command* init_command(InspIRCd* Instance)
@@ -27,12 +26,15 @@ 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;
 
-       if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
+       if (parameters[0][0] == '$')
        {
+               if (!user->HasPrivPermission("users/mass-message"))
+                       return CMD_SUCCESS;
+
                int MOD_RESULT = 0;
                std::string temp = parameters[1];
                FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list));
@@ -43,7 +45,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                const char* servermask = (parameters[0].c_str()) + 1;
 
                FOREACH_MOD(I_OnText,OnText(user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, except_list));
-               if (match(ServerInstance->Config->ServerName,servermask))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName, servermask, NULL))
                {
                        user->SendAll("PRIVMSG", "%s", text);
                }
@@ -66,18 +68,28 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
 
                if (chan)
                {
-                       if (IS_LOCAL(user))
+                       if (IS_LOCAL(user) && chan->GetStatus(user) < STATUS_VOICE)
                        {
-                               if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
+                               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'))
                                {
-                                       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;
                                }
+
+                               if (ServerInstance->Config->RestrictBannedUsers)
+                               {
+                                       if (chan->IsBanned(user))
+                                       {
+                                               user->WriteNumeric(404, "%s %s :Cannot send to channel (you're banned)", user->nick.c_str(), chan->name.c_str());
+                                               return CMD_FAILURE;
+                                       }
+                               }
                        }
                        int MOD_RESULT = 0;
 
@@ -91,7 +103,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        /* Check again, a module may have zapped the input string */
                        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;
                        }
 
@@ -101,16 +113,16 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                        {
                                if (ServerInstance->Config->UndernetMsgPrefix)
                                {
-                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, text);
+                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name.c_str(), status, text);
                                }
                                else
                                {
-                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, text);
+                                       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, text);
+                               chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name.c_str(), text);
                        }
 
                        FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,text,status,except_list));
@@ -118,7 +130,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                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;
@@ -129,16 +141,17 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        if (IS_LOCAL(user))
        {
                const char* targetserver = strchr(destnick, '@');
-       
+
                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))
                        {
                                /* 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;
                        }
                }
@@ -152,18 +165,18 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        {
                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;
                }
 
                if (IS_AWAY(dest))
                {
                        /* auto respond with aweh msg */
-                       user->WriteNumeric(301, "%s %s :%s",user->nick,dest->nick,dest->awaymsg);
+                       user->WriteNumeric(301, "%s %s :%s", user->nick.c_str(), dest->nick.c_str(), dest->awaymsg.c_str());
                }
 
                int MOD_RESULT = 0;
-               
+
                std::string temp = parameters[1];
                FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user, dest, TYPE_USER, temp, 0, except_list));
                if (MOD_RESULT) {
@@ -176,7 +189,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
                if (IS_LOCAL(dest))
                {
                        // direct write, same server
-                       user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, text);
+                       user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick.c_str(), text);
                }
 
                FOREACH_MOD(I_OnUserMessage,OnUserMessage(user, dest, TYPE_USER, text, 0, except_list));
@@ -184,9 +197,8 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
        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;
        }
        return CMD_SUCCESS;
 }
-