FindNick, FindChan, ChanModes, UserList, CountInvisible, PurgeEmptyChannels, GetClass...

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 53a9e82ddd8098b09757bf467fab8a7c47e49d38..e72e1ef757ac6d606cc368cc492e57f7c546663d 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -26,31 +26,37 @@
 #include "helperfuncs.h"
 #include "commands/cmd_privmsg.h"
 
-extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern ModuleList modules;
 extern FactoryList factory;
 extern time_t TIME;
 
-void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        chanrec *chan;
 
        user->idle_lastmsg = TIME;
        
-       if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-2,0))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
-       if ((parameters[0][0] == '$') && (*user->oper))
+
+       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
        {
+               int MOD_RESULT = 0;
+               std::string temp = parameters[1];
+               FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+               if (MOD_RESULT)
+                       return;
+               parameters[1] = (char*)temp.c_str();
                // notice to server mask
-               char* servermask = parameters[0];
-               servermask++;
-               if (match(Config->ServerName,servermask))
+               const char* servermask = parameters[0] + 1;
+               if (match(ServerInstance->Config->ServerName,servermask))
                {
-                       ServerPrivmsgAll("%s",parameters[1]);
+                       ServerInstance->ServerPrivmsgAll("%s",parameters[1]);
                }
+               FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
                return;
        }
        char status = 0;
@@ -61,19 +67,19 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
        }
        if (parameters[0][0] == '#')
        {
-               chan = FindChan(parameters[0]);
+               chan = ServerInstance->FindChan(parameters[0]);
                if (chan)
                {
                        if (IS_LOCAL(user))
                        {
                                if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
                                {
-                                       WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
+                                       user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
                                        return;
                                }
                                if ((chan->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
                                {
-                                       WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+                                       user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
                                        return;
                                }
                        }
@@ -88,28 +94,28 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 
                        if (temp == "")
                        {
-                               WriteServ(user->fd,"412 %s No text to send", user->nick);
+                               user->WriteServ("412 %s No text to send", user->nick);
                                return;
                        }
                        
-                       ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
+                       chan->WriteAllExceptSender(user, status, "PRIVMSG %s :%s", chan->name, parameters[1]);
                        FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status));
                }
                else
                {
                        /* no such nick/channel */
-                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                       user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                }
                return;
        }
 
-       dest = Find(parameters[0]);
+       dest = ServerInstance->FindNick(parameters[0]);
        if (dest)
        {
                if ((IS_LOCAL(user)) && (*dest->awaymsg))
                {
                        /* auto respond with aweh msg */
-                       WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
+                       user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg);
                }
 
                int MOD_RESULT = 0;
@@ -124,7 +130,7 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
                if (dest->fd > -1)
                {
                        // direct write, same server
-                       WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+                       user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
                }
 
                FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0));
@@ -132,6 +138,6 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
        else
        {
                /* no such nick/channel */
-               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
        }
 }