Some more text fixes and improvements (#1618).

[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 e4b36b0357961d1fb1412f6eaa22e1b3d7a9376f..9fb6b3de5ab165e43b1d40ae12b545fe0e21d90a 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -1,93 +1,103 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style SAPART command */
+#include "inspircd.h"
 
-Server *Srv;
-        
-void handle_sapart(char **parameters, int pcnt, userrec *user)
+/** Handle /SAPART
+ */
+class CommandSapart : public Command
 {
-       userrec* dest = Srv->FindNick(std::string(parameters[0]));
-       if (dest)
+ public:
+       CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3)
        {
-               for (int x = 0; x < strlen(parameters[1]); x++)
+               flags_needed = 'o'; syntax = "<nick> <channel>[,<channel>]+ [:<reason>]";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
+       }
+
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
+       {
+               if (CommandParser::LoopCall(user, this, parameters, 1))
+                       return CMD_FAILURE;
+
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               Channel* channel = ServerInstance->FindChan(parameters[1]);
+               std::string reason;
+
+               if ((dest) && (dest->registered == REG_ALL) && (channel))
                {
-                               if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ','))
-                               {
-                                       Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name");
-                                       return;
-                               }
-               }
+                       if (parameters.size() > 2)
+                               reason = parameters[2];
 
-               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));
-       }
-}
+                       if (dest->server->IsULine())
+                       {
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
+                               return CMD_FAILURE;
+                       }
 
+                       if (!channel->HasUser(dest))
+                       {
+                               user->WriteNotice("*** " + dest->nick + " is not on " + channel->name);
+                               return CMD_FAILURE;
+                       }
 
-class ModuleSapart : public Module
-{
- public:
-       ModuleSapart()
-       {
-               Srv = new Server;
-               Srv->AddCommand("SAPART",handle_sapart,'o',2,"m_sapart.so");
-       }
-       
-       virtual ~ModuleSapart()
-       {
-               delete Srv;
+                       /* For local clients, directly part them generating a PART message. For remote clients,
+                        * just return CMD_SUCCESS knowing the protocol module will route the SAPART to the users
+                        * local server and that will generate the PART instead
+                        */
+                       if (IS_LOCAL(dest))
+                       {
+                               channel->PartUser(dest, reason);
+                               ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+channel->name);
+                       }
+
+                       return CMD_SUCCESS;
+               }
+               else
+               {
+                       user->WriteNotice("*** Invalid nickname or channel");
+               }
+
+               return CMD_FAILURE;
        }
-       
-       virtual Version GetVersion()
+
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               return Version(1,0,0,1);
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
-       
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleSapartFactory : public ModuleFactory
+class ModuleSapart : public Module
 {
+       CommandSapart cmd;
  public:
-       ModuleSapartFactory()
-       {
-       }
-       
-       ~ModuleSapartFactory()
+       ModuleSapart()
+               : cmd(this)
        {
        }
-       
-       virtual Module * CreateModule()
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return new ModuleSapart;
+               return Version("Provides the SAPART command, allows opers to force-part users from channels", VF_OPTCOMMON | VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSapartFactory;
-}
-
+MODULE_INIT(ModuleSapart)