Swap around ERROR and SNONOTICE in SendError() so that the server doesnt try and...

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index f3295df07e88f30d55a4d252bce3d8fb0d668b26..5c3020b5b4e75ef2bea1cc87d2580b00503db87a 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_privmsg.h"
 
@@ -67,12 +64,12 @@ CmdResult cmd_privmsg::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;
@@ -121,7 +118,11 @@ CmdResult cmd_privmsg::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])