Remove InspIRCd* parameters and fields

[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 d07a96fb70148f3c9af1b9df0930e439cb0f73cb..255648f850c0860428a10b28ac033d186c1b67d2 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,32 +12,34 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
 /** Handle /SAPART
  */
-class cmd_sapart : public command_t
+class CommandSapart : public Command
 {
  public:
-       cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
+       CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
        {
-               this->source = "m_sapart.so";
-               syntax = "<nick> <channel>";
+               flags_needed = 'o'; Penalty = 0; syntax = "<nick> <channel> [reason]";
+               TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
-               chanrec* channel = ServerInstance->FindChan(parameters[1]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               Channel* channel = ServerInstance->FindChan(parameters[1]);
+               std::string reason = "";
+
                if (dest && channel)
                {
+                       if (parameters.size() > 2)
+                               reason = parameters[2];
+
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
 
@@ -47,67 +49,70 @@ class cmd_sapart : public command_t
                         */
                        if (IS_LOCAL(dest))
                        {
-                               if (!channel->PartUser(dest, dest->nick))
+                               if (!channel->PartUser(dest, reason))
                                        delete channel;
-                               chanrec* n = ServerInstance->FindChan(parameters[1]);
+
+                               Channel* n = ServerInstance->FindChan(parameters[1]);
                                if (!n)
                                {
-                                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+                                       ServerInstance->SNO->WriteGlobalSno('a', 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]);
+                                               ServerInstance->SNO->WriteGlobalSno('a', 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]);
+                                               user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
                                                return CMD_FAILURE;
                                        }
                                }
                        }
-                       else
-                       {
-                               ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
-                       }
 
                        return CMD_SUCCESS;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
+                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
                }
 
                return CMD_FAILURE;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               if (dest)
+                       return ROUTE_OPT_UCAST(dest->server);
+               return ROUTE_LOCALONLY;
+       }
 };
 
 
 class ModuleSapart : public Module
 {
-       cmd_sapart*     mycommand;
+       CommandSapart cmd;
  public:
-       ModuleSapart(InspIRCd* Me)
-               : Module(Me)
+       ModuleSapart()
+               : cmd(this)
        {
-               
-               mycommand = new cmd_sapart(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleSapart()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
-MODULE_INIT(ModuleSapart);
+MODULE_INIT(ModuleSapart)