Allow for custom prefixes as status chars in /notice @#chan etc. Up until now theyve...

[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 5be9d4cff865db3bb85930df4ba65252ee38951a..9ce089dc0cd44c0129eddf6976b446575a4ca86c 100644 (file)
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,7 +20,7 @@ extern "C" DllExport  Command* init_command(InspIRCd* Instance)
        return new CommandPrivmsg(Instance);
 }
 
-CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPrivmsg::Handle (const char* const* parameters, int pcnt, User *user)
 {
        User *dest;
        Channel *chan;
@@ -38,26 +38,26 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0,except_list));
                if (MOD_RESULT)
                        return CMD_FAILURE;
-               parameters[1] = temp.c_str();
-               // notice to server mask
+               const char* text = temp.c_str();
                const char* servermask = parameters[0] + 1;
-               FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
+               FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,text,0,except_list));
                if (match(ServerInstance->Config->ServerName,servermask))
                {
-                       user->SendAll("PRIVMSG", "%s", parameters[1]);
+                       user->SendAll("PRIVMSG", "%s", text);
                }
-               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,text,0,except_list));
                return CMD_SUCCESS;
        }
        char status = 0;
-       if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+       const char* target = parameters[0];
+       if (ServerInstance->Modes->FindPrefix(*target))
        {
-               status = *parameters[0];
-               parameters[0]++;
+               status = *target;
+               target++;
        }
-       if (parameters[0][0] == '#')
+       if (*target == '#')
        {
-               chan = ServerInstance->FindChan(parameters[0]);
+               chan = ServerInstance->FindChan(target);
 
                except_list[user] = user->nick;
 
@@ -67,12 +67,12 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                        {
                                if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
                                {
-                                       user->WriteServ("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, chan->name);
                                        return CMD_FAILURE;
                                }
                                if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
                                {
-                                       user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+                                       user->WriteNumeric(404, "%s %s :Cannot send to channel (+m)", user->nick, chan->name);
                                        return CMD_FAILURE;
                                }
                        }
@@ -83,39 +83,39 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                        if (MOD_RESULT) {
                                return CMD_FAILURE;
                        }
-                       parameters[1] = temp.c_str();
+                       const char* text = temp.c_str();
 
                        /* Check again, a module may have zapped the input string */
                        if (temp.empty())
                        {
-                               user->WriteServ("412 %s :No text to send", user->nick);
+                               user->WriteNumeric(412, "%s :No text to send", user->nick);
                                return CMD_FAILURE;
                        }
 
-                       FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
+                       FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,text,status,except_list));
 
                        if (status)
                        {
                                if (ServerInstance->Config->UndernetMsgPrefix)
                                {
-                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
+                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, text);
                                }
                                else
                                {
-                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, parameters[1]);
+                                       chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, text);
                                }
                        }
                        else 
                        {
-                               chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, parameters[1]);
+                               chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, text);
                        }
 
-                       FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
+                       FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,text,status,except_list));
                }
                else
                {
                        /* no such nick/channel */
-                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, target);
                        return CMD_FAILURE;
                }
                return CMD_SUCCESS;
@@ -135,7 +135,7 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                        if (dest && strcasecmp(dest->server, targetserver + 1))
                        {
                                /* Incorrect server for user */
-                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
                                return CMD_FAILURE;
                        }
                }
@@ -149,14 +149,14 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
        {
                if (!*parameters[1])
                {
-                       user->WriteServ("412 %s :No text to send", user->nick);
+                       user->WriteNumeric(412, "%s :No text to send", user->nick);
                        return CMD_FAILURE;
                }
 
                if (IS_AWAY(dest))
                {
                        /* auto respond with aweh msg */
-                       user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
+                       user->WriteNumeric(301, "%s %s :%s",user->nick,dest->nick,dest->awaymsg);
                }
 
                int MOD_RESULT = 0;
@@ -166,22 +166,22 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
                if (MOD_RESULT) {
                        return CMD_FAILURE;
                }
-               parameters[1] = (char*)temp.c_str();
+               const char* text = temp.c_str();
 
-               FOREACH_MOD(I_OnText,OnText(user,dest,TYPE_USER,parameters[1],0,except_list));
+               FOREACH_MOD(I_OnText,OnText(user,dest,TYPE_USER,text,0,except_list));
 
                if (IS_LOCAL(dest))
                {
                        // direct write, same server
-                       user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+                       user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, text);
                }
 
-               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0,except_list));
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,text,0,except_list));
        }
        else
        {
                /* no such nick/channel */
-               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
                return CMD_FAILURE;
        }
        return CMD_SUCCESS;