Remove next_call garbage.. It didn't really do much more than obfuscate things. InspI...

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index f43b6cd208793bdb09326abc90396b7cb41057f6..cf4d7b44acaf64322620d3d46abb79a6a8de10fd 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -12,21 +12,18 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_notice.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
        return new cmd_notice(Instance);
 }
 
-CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_notice::Handle (const char** parameters, int pcnt, User *user)
 {
-       userrec *dest;
-       chanrec *chan;
+       User *dest;
+       Channel *chan;
 
        CUList exempt_list;
 
@@ -48,7 +45,7 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                {
                        user->SendAll("NOTICE", "%s", parameters[1]);
                }
-               FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
+               FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
                return CMD_SUCCESS;
        }
        char status = 0;
@@ -67,12 +64,12 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                {
                        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;
@@ -89,7 +86,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;
                        }
 
@@ -120,11 +117,20 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                return CMD_SUCCESS;
        }
        
-       dest = ServerInstance->FindNick(parameters[0]);
+       if (IS_LOCAL(user))
+               dest = ServerInstance->FindNickOnly(parameters[0]);
+       else
+               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) {