Move InspIRCd::IsValidMask() to helperfuncs.cpp

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

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 71e121a522bd6f2164b484934e3a131818096b4d..96aff839246ae6c00a621ea031e0a6401391fec8 100644 (file)
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -12,22 +12,18 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_privmsg.h"
 
-extern "C" DllExport  command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport  Command* init_command(InspIRCd* Instance)
 {
-       return new cmd_privmsg(Instance);
+       return new CommandPrivmsg(Instance);
 }
 
-CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
 {
-       userrec *dest;
-       chanrec *chan;
-
+       User *dest;
+       Channel *chan;
        CUList except_list;
 
        user->idle_lastmsg = ServerInstance->Time();
@@ -68,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;
@@ -88,9 +84,10 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        parameters[1] = temp.c_str();
 
+                       /* Check again, a module may have zapped the input string */
                        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;
                        }
 
@@ -121,9 +118,19 @@ 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])
+               {
+                       user->WriteServ("412 %s :No text to send", user->nick);
+                       return CMD_FAILURE;
+               }
+
                if (IS_AWAY(dest))
                {
                        /* auto respond with aweh msg */