Tidyup

[user/henk/code/inspircd.git] / src / modules / m_sapart.cpp

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 6d1086bba5d670229c04ac81eaaef34368e350f9..9f4e245da37bcc24eb6651141321826e68d5e7f1 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -21,36 +21,59 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-static Server *Srv;
-
+/** Handle /SAPART
+ */
 class cmd_sapart : public command_t
 {
  public:
-       cmd_sapart () : command_t("SAPART", 'o', 2)
+       cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
        {
                this->source = "m_sapart.so";
                syntax = "<nick> <channel>";
        }
-        
-       void Handle (const char** parameters, int pcnt, userrec *user)
+
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               userrec* dest = Srv->FindNick(parameters[0]);
-               chanrec* channel = Srv->FindChannel(parameters[1]);
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               chanrec* channel = ServerInstance->FindChan(parameters[1]);
                if (dest && channel)
                {
-                       if (Srv->IsUlined(dest->server))
+                       if (ServerInstance->ULine(dest->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
-                       Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+
                        if (!channel->PartUser(dest, dest->nick))
                                delete channel;
+                       chanrec* n = ServerInstance->FindChan(parameters[1]);
+                       if (!n)
+                       {
+                               ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                               return CMD_SUCCESS;
+                       }
+                       else
+                       {
+                               if (!n->HasUser(dest))
+                               {
+                                       ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                                       return CMD_SUCCESS;
+                               }
+                               else
+                               {
+                                       user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]);
+                                       return CMD_FAILURE;
+                               }
+                       }
+
+                       return CMD_SUCCESS;
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -59,12 +82,12 @@ class ModuleSapart : public Module
 {
        cmd_sapart*     mycommand;
  public:
-       ModuleSapart(Server* Me)
+       ModuleSapart(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_sapart();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_sapart(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSapart()
@@ -73,7 +96,7 @@ class ModuleSapart : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
 };
@@ -91,7 +114,7 @@ class ModuleSapartFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSapart(Me);
        }