Fix this so it works, passes test case. Provide a method to query for a bit and to...

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

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 9ca25aa0892b68e6d4d2adcac18c45da42a96f14..ccac0df7b5bb43f376848d67fec10d4ba661a06d 100644 (file)
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -14,20 +14,19 @@
  * ---------------------------------------------------
  */
 
-#include <vector>
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_invite.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_invite(Instance);
+}
 
-void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /INVITE
+ */
+CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
 {
        int MOD_RESULT = 0;
 
@@ -47,7 +46,7 @@ void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                                user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                        }
 
-                       return;
+                       return CMD_FAILURE;
                }
 
                if ((c->modes[CM_INVITEONLY]) && (IS_LOCAL(user)))
@@ -55,27 +54,27 @@ void 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);
-                               return;
+                               return CMD_FAILURE;
                        }
                }
 
                if (c->HasUser(u))
                {
                        user->WriteServ("443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name);
-                       return;
+                       return CMD_FAILURE;
                }
 
                if ((IS_LOCAL(user)) && (!c->HasUser(user)))
                {
                        user->WriteServ("442 %s %s :You're not on that channel!",user->nick, c->name);
-                       return;
+                       return CMD_FAILURE;
                }
 
                FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c));
 
                if (MOD_RESULT == 1)
                {
-                       return;
+                       return CMD_FAILURE;
                }
 
                irc::string xname(c->name);
@@ -95,4 +94,6 @@ void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                }
                user->WriteServ("347 %s :End of INVITE list",user->nick);
        }
+       return CMD_SUCCESS;
 }
+