X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_devoice.cpp;h=901f77b1a83b1d22a7003828381dd2f14bab83ad;hb=2a924db786cfb2531126f56a8227bd46c63e444c;hp=c1f4e3bc871cd4589d9cfe1366f602754d23d262;hpb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index c1f4e3bc8..901f77b1a 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -1,106 +1,65 @@
-/*       +------------------------------------+
- *       | 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
  *  Syntax: /DEVOICE <#chan>
  */
 
-/* $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"
 
 /** Handle /DEVOICE
- */	 
-class cmd_devoice : public command_t
+ */
+class CommandDevoice : public Command
 {
  public:
-	cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1)
+	CommandDevoice(Module* Creator) : Command(Creator,"DEVOICE", 1)
 	{
-		this->source = "m_devoice.so";
 		syntax = "<channel>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		chanrec* c = ServerInstance->FindChan(parameters[0]);
-		if (c && c->HasUser(user))
-		{
-			const char* modes[3];
-			modes[0] = parameters[0];
-			modes[1] = "-v";
-			modes[2] = user->nick;
-
-			ServerInstance->SendMode(modes,3,user);
+		std::vector<std::string> modes;
+		modes.push_back(parameters[0]);
+		modes.push_back("-v");
+		modes.push_back(user->nick);
 
-			return CMD_SUCCESS;
-		}
-
-		return CMD_FAILURE;
+		ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleDeVoice : public Module
 {
-	cmd_devoice *mycommand;
+	CommandDevoice cmd;
  public:
-	ModuleDeVoice(InspIRCd* Me) : Module::Module(Me)
-	{
-		
-		mycommand = new cmd_devoice(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleDeVoice()
-	{
-	}
-	
-	virtual Version GetVersion()
+	ModuleDeVoice() : cmd(this)
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
 	}
-};
-
 
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-	ModuleDeVoiceFactory()
-	{
-	}
-	
-	~ModuleDeVoiceFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* 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 * init_module( void )
-{
-	return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)