(Bigger than it looks, i did this with perl inplace edit) -- commands now take an...

[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 afbdbdc870d0fd0ab089f759f524bd843deb215b..590c22c675b38a45bee247ae496539fbc880f143 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -22,37 +22,36 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
-static Server *Srv;
+
+extern InspIRCd* ServerInstance;
 
 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)
        {
-               userrec* dest = Srv->FindNick(std::string(parameters[0]));
-               if (dest)
+               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               chanrec* channel = ServerInstance->FindChan(parameters[1]);
+               if (dest && channel)
                {
-                       if (Srv->IsUlined(dest->server))
+                       if (ServerInstance->IsUlined(dest->server))
                        {
-                               WriteServ(user->fd,"990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return;
                        }
-                       if (!IsValidChannelName(parameters[1]))
-                       {
-                               Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                               return;
-                       }
-
-                       Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::string(dest->nick)+" part "+parameters[1]);
-                       Srv->PartUserFromChannel(dest,std::string(parameters[1]),std::string(dest->nick));
+                       ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                       if (!channel->PartUser(dest, dest->nick))
+                               delete channel;
                }
        }
 };
@@ -62,12 +61,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()
@@ -94,7 +93,7 @@ class ModuleSapartFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSapart(Me);
        }