Fuck. Press save, then commit.

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

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index a6e82d281de98cd8e3bab2ce8faf2985b3341286..49382deb8773cc9b1598a71b253a74df4902ebb6 100644 (file)
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -12,26 +12,23 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.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);
 }
 
 /** Handle /INVITE
  */
-CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_invite::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))
                {
@@ -51,7 +48,7 @@ CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *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;
                        }
                }
@@ -86,6 +83,12 @@ CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                        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;