X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_devoice.cpp;h=7c2dcb3d81fb85091bf51508f90b3ad552d2cae1;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=214de57833a21d967ccb241c92b8636e75850fc4;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 214de5783..7c2dcb3d8 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -2,20 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /*
  * DEVOICE module for InspIRCd
  *  Syntax: /DEVOICE <#chan>
@@ -23,80 +18,55 @@ 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;
+		Channel* c = ServerInstance->FindChan(parameters[0]);
+		if (c && c->HasUser(user))
+		{
+			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->SendMode(modes, ServerInstance->FakeClient);
+			ServerInstance->PI->SendMode(c->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+			return CMD_SUCCESS;
+		}
+
+		return CMD_FAILURE;
 	}
 };
 
 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);
+		ServerInstance->AddCommand(&cmd);
 	}
-	
+
 	virtual ~ModuleDeVoice()
 	{
 	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
-	}
-};
-
 
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-	ModuleDeVoiceFactory()
-	{
-	}
-	
-	~ModuleDeVoiceFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(Server* Me)
+	virtual Version GetVersion()
 	{
-		return new ModuleDeVoice(Me);
+		return Version("Provides voiced users with the ability to devoice themselves.", VF_VENDOR, API_VERSION);
 	}
-	
 };
 
-
-extern "C" void * module_init( void )
-{
-	return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)