Move InspIRCd::IsValidMask() to helperfuncs.cpp

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

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index c9d4b2d8a2bd13b2e78be461b5e1b3d2a4b2eb67..d5ce160ac97202be83f1e2c72cb03ff1fd204a67 100644 (file)
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -11,26 +11,24 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "commands/cmd_invite.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-       return new cmd_invite(Instance);
+       return new CommandInvite(Instance);
 }
 
 /** Handle /INVITE
  */
-CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
 {
        int MOD_RESULT = 0;
 
        if (pcnt == 2)
        {
-               userrec* u = ServerInstance->FindNick(parameters[0]);
-               chanrec* c = ServerInstance->FindChan(parameters[1]);
+               User* u = ServerInstance->FindNick(parameters[0]);
+               Channel* c = ServerInstance->FindChan(parameters[1]);
 
                if ((!c) || (!u))
                {
@@ -46,11 +44,11 @@ CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                        return CMD_FAILURE;
                }
 
-               if ((c->modes[CM_INVITEONLY]) && (IS_LOCAL(user)))
+               if ((c->IsModeSet('i')) && (IS_LOCAL(user)))
                {
                        if (c->GetStatus(user) < STATUS_HOP)
                        {
-                               user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
+                               user->WriteServ("482 %s %s :You must be a channel %soperator", user->nick, c->name, c->GetStatus(u) == STATUS_HOP ? "" : "half-");
                                return CMD_FAILURE;
                        }
                }
@@ -77,8 +75,24 @@ CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                u->InviteTo(c->name);
                u->WriteFrom(user,"INVITE %s :%s",u->nick,c->name);
                user->WriteServ("341 %s %s %s",user->nick,u->nick,c->name);
-               if (ServerInstance->Config->AnnounceInvites)
-                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+               switch (ServerInstance->Config->AnnounceInvites)
+               {
+                       case ServerConfig::INVITE_ANNOUNCE_ALL:
+                               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                       break;
+                       case ServerConfig::INVITE_ANNOUNCE_OPS:
+                               c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                       break;
+                       case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
+                               if (c->IsModeSet('i'))
+                                       c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                               else
+                                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+                       break;
+                       default:
+                               /* Nobody */
+                       break;
+               }
                FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c));
        }
        else