Tidy up strlens which are not required

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 434594df99c299e53a346912d03c84a6e25ae00b..d947c70be49dea3e114b53c56f5630fdfe2837fb 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -14,46 +14,44 @@
  * ---------------------------------------------------
  */
 
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "configreader.h"
-#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)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_notice(Instance);
+}
+
+CmdResult 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(this,parameters,pcnt,user,0,pcnt-2,0))
-               return;
-       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+               return CMD_SUCCESS;
+       if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
        {
-               // notice to server mask
-               const char* servermask = parameters[0] + 1;
-               if (match(Config->ServerName,servermask))
-               {
-                       NoticeAll(user, true, "%s",parameters[1]);
-               }
-               return;
+               int MOD_RESULT = 0;
+                std::string temp = parameters[1];
+                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0));
+                if (MOD_RESULT)
+                        return CMD_FAILURE;
+                parameters[1] = (char*)temp.c_str();
+                // notice to server mask
+                const char* servermask = parameters[0] + 1;
+                if (match(ServerInstance->Config->ServerName,servermask))
+                {
+                        user->NoticeAll("%s",parameters[1]);
+                }
+                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0));
+                return CMD_SUCCESS;
        }
        char status = 0;
        if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
@@ -63,20 +61,20 @@ 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))
                        {
                                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);
-                                       return;
+                                       user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
+                                       return CMD_FAILURE;
                                }
-                               if ((chan->modes[CM_MODERATED]) && (cstatus(user,chan)<STATUS_VOICE))
+                               if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
                                {
-                                       WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
-                                       return;
+                                       user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
+                                       return CMD_FAILURE;
                                }
                        }
 
@@ -85,29 +83,30 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                        std::string temp = parameters[1];
                        FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status));
                        if (MOD_RESULT) {
-                               return;
+                               return CMD_FAILURE;
                        }
-                       parameters[1] = (char*)temp.c_str();
+                       parameters[1] = temp.c_str();
 
                        if (temp == "")
                        {
-                               WriteServ(user->fd,"412 %s No text to send", user->nick);
-                               return;
+                               user->WriteServ("412 %s No text to send", user->nick);
+                               return CMD_FAILURE;
                        }
 
-                       ChanExceptSender(chan, user, status, "NOTICE %s :%s", chan->name, parameters[1]);
+                       chan->WriteAllExceptSender(user, false, status, "NOTICE %s :%s", chan->name, parameters[1]);
 
                        FOREACH_MOD(I_OnUserNotice,OnUserNotice(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 CMD_FAILURE;
                }
-               return;
+               return CMD_SUCCESS;
        }
        
-       dest = Find(parameters[0]);
+       dest = ServerInstance->FindNick(parameters[0]);
        if (dest)
        {
                int MOD_RESULT = 0;
@@ -115,14 +114,14 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                std::string temp = parameters[1];
                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0));
                if (MOD_RESULT) {
-                       return;
+                       return CMD_FAILURE;
                }
                parameters[1] = (char*)temp.c_str();
 
-               if (dest->fd > -1)
+               if (IS_LOCAL(dest))
                {
                        // direct write, same server
-                       WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]);
+                       user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]);
                }
 
                FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0));
@@ -130,6 +129,11 @@ void cmd_notice::Handle (const 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]);
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
+
 }
+