Move a bundle of stuff to server.cpp from inspircd.cpp

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 7ce2d93c5f3c9cca947b6359afc40b6f7c4b4fe0..5df5b8ace6f90d66e12cdc82e8350de4ab885a6e 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -11,15 +11,14 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_notice.h"
 
-
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_notice(Instance);
 }
@@ -35,22 +34,22 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return CMD_SUCCESS;
-       if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
+       if ((parameters[0][0] == '$') && (IS_OPER(user) || ServerInstance->ULine(user->server)))
        {
                int MOD_RESULT = 0;
-                std::string temp = parameters[1];
-                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
-                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->SendAll("NOTICE", "%s", parameters[1]);
-                }
-                FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
-                return CMD_SUCCESS;
+               std::string temp = parameters[1];
+               FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
+               if (MOD_RESULT)
+                       return CMD_FAILURE;
+               parameters[1] = temp.c_str();
+               // notice to server mask
+               const char* servermask = parameters[0] + 1;
+               if (match(ServerInstance->Config->ServerName,servermask))
+               {
+                       user->SendAll("NOTICE", "%s", parameters[1]);
+               }
+               FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
+               return CMD_SUCCESS;
        }
        char status = 0;
        if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
@@ -62,18 +61,18 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        {
                chan = ServerInstance->FindChan(parameters[0]);
 
-               exempt_list[user] = user;
+               exempt_list[user] = user->nick;
 
                if (chan)
                {
                        if (IS_LOCAL(user))
                        {
-                               if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user)))
+                               if ((chan->IsModeSet('n')) && (!chan->HasUser(user)))
                                {
                                        user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name);
                                        return CMD_FAILURE;
                                }
-                               if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE))
+                               if ((chan->IsModeSet('m')) && (chan->GetStatus(user) < STATUS_VOICE))
                                {
                                        user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name);
                                        return CMD_FAILURE;
@@ -90,7 +89,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
 
                        if (temp.empty())
                        {
-                               user->WriteServ("412 %s No text to send", user->nick);
+                               user->WriteServ("412 %s :No text to send", user->nick);
                                return CMD_FAILURE;
                        }
 
@@ -124,8 +123,13 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        dest = ServerInstance->FindNick(parameters[0]);
        if (dest)
        {
+               if (!*parameters[1])
+               {
+                       user->WriteServ("412 %s :No text to send", user->nick);
+                       return CMD_FAILURE;
+               }
+
                int MOD_RESULT = 0;
-               
                std::string temp = parameters[1];
                FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0,exempt_list));
                if (MOD_RESULT) {