X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_devoice.cpp;h=889658d2000b838dbd3b78e6f37d4ddb486dbd2a;hb=3624c137a6db85eaab0372550c9dca79d6d21e55;hp=55b6abef72ac50322de99bd990cc442e48a4ca5d;hpb=dc8f5d02f77aeabefaefe88005b99c8b47030ab7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 55b6abef7..889658d20 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -1,20 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 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.
  *
- *  InspIRCd is copyright (C) 2002-2006 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.
+ * 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/>.
  */
 
-using namespace std;
 
 /*
  * DEVOICE module for InspIRCd
@@ -23,81 +26,48 @@ using namespace std;
 
 /* $ModDesc: Provides voiced users with the ability to devoice themselves. */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
-static Server *Srv;
-	 
-class cmd_devoice : public command_t
+/** Handle /DEVOICE
+ */
+class CommandDevoice : public Command
 {
  public:
-	cmd_devoice () : command_t("DEVOICE", 0, 1)
+	CommandDevoice(Module* Creator) : Command(Creator,"DEVOICE", 1)
 	{
-		this->source = "m_devoice.so";
 		syntax = "<channel>";
+		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		/*
-		 * NOTE: DO NOT CODE LIKE THIS!!! This has no checks and can send
-		 * invalid or plain confusing mode changes, code some checking!
-		 *
-		 * - I'm not aware what checking I need, so for now... be supreme evil.
-		 */
-		const char* modes[3];
-		modes[0] = parameters[0];
-		modes[1] = "-v";
-		modes[2] = user->nick;
+		std::vector<std::string> modes;
+		modes.push_back(parameters[0]);
+		modes.push_back("-v");
+		modes.push_back(user->nick);
 
-		Srv->SendMode(modes,3,user);
+		ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleDeVoice : public Module
 {
-	cmd_devoice *mycommand;
+	CommandDevoice cmd;
  public:
-	ModuleDeVoice(Server* Me) : Module::Module(Me)
+	ModuleDeVoice() : cmd(this)
 	{
-		Srv = Me;
-		mycommand = new cmd_devoice();
-		Srv->AddCommand(mycommand);
 	}
-	
-	virtual ~ModuleDeVoice()
-	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
-	}
-};
 
-
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-	ModuleDeVoiceFactory()
-	{
-	}
-	
-	~ModuleDeVoiceFactory()
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->Modules->AddService(cmd);
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleDeVoice(Me);
+		return Version("Provides voiced users with the ability to devoice themselves.", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * module_init( void )
-{
-	return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)