More tweaks

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 08ae3f26055a62d5ce257a4aea6aa544b1fe8fd7..006036145097c627b1f0294460808847817aa01d 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -22,30 +22,22 @@
 #include "hash_map.h"
 #include "users.h"
 #include "modules.h"
-#include "message.h"
 #include "wildcard.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "commands/cmd_notice.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-
 void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        chanrec *chan;
 
-       user->idle_lastmsg = TIME;
+       user->idle_lastmsg = ServerInstance->Time();
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
-       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
+       if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
        {
                int MOD_RESULT = 0;
                 std::string temp = parameters[1];
@@ -55,9 +47,9 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                 parameters[1] = (char*)temp.c_str();
                 // notice to server mask
                 const char* servermask = parameters[0] + 1;
-                if (match(Config->ServerName,servermask))
+                if (match(ServerInstance->Config->ServerName,servermask))
                 {
-                        NoticeAll(user, true, "%s",parameters[1]);
+                        user->NoticeAll("%s",parameters[1]);
                 }
                 FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
                 return;
@@ -70,7 +62,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        }
        if (*parameters[0] == '#')
        {
-               chan = FindChan(parameters[0]);
+               chan = ServerInstance->FindChan(parameters[0]);
                if (chan)
                {
                        if (IS_LOCAL(user))
@@ -80,7 +72,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                                        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))
+                               if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
                                {
                                        user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
                                        return;
@@ -114,7 +106,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                return;
        }
        
-       dest = Find(parameters[0]);
+       dest = ServerInstance->FindNick(parameters[0]);
        if (dest)
        {
                int MOD_RESULT = 0;
@@ -126,7 +118,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                }
                parameters[1] = (char*)temp.c_str();
 
-               if (dest->fd > -1)
+               if (IS_LOCAL(dest))
                {
                        // direct write, same server
                        user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]);