Merge pull request #1351 from SaberUK/master+webirc

[user/henk/code/inspircd.git] / src / modules / m_devoice.cpp

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index ff85dbd67e7b1df97ef0d3bdd8c3736ead14eb5f..4e4b3a354b4efdb0bd7bf8c97584b36e61498251 100644 (file)
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -1,23 +1,29 @@
-/*       +------------------------------------+
- *       | 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>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 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/>.
  */
 
+
 /*
  * DEVOICE module for InspIRCd
  *  Syntax: /DEVOICE <#chan>
  */
 
-/* $ModDesc: Provides voiced users with the ability to devoice themselves. */
-
 #include "inspircd.h"
 
 /** Handle /DEVOICE
@@ -25,28 +31,20 @@
 class CommandDevoice : public Command
 {
  public:
-       CommandDevoice (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"DEVOICE", 0, 1)
+       CommandDevoice(Module* Creator) : Command(Creator,"DEVOICE", 1)
        {
                syntax = "<channel>";
-               TRANSLATE2(TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               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);
+               std::vector<std::string> modes;
+               modes.push_back(parameters[0]);
+               modes.push_back("-v");
+               modes.push_back(user->nick);
 
-                       ServerInstance->SendMode(modes, ServerInstance->FakeClient);
-                       ServerInstance->PI->SendMode(c->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
-                       return CMD_SUCCESS;
-               }
-
-               return CMD_FAILURE;
+               ServerInstance->Parser.CallHandler("MODE", modes, ServerInstance->FakeClient);
+               return CMD_SUCCESS;
        }
 };
 
@@ -54,18 +52,13 @@ class ModuleDeVoice : public Module
 {
        CommandDevoice cmd;
  public:
-       ModuleDeVoice(InspIRCd* Me) : Module(Me), cmd(Me, this)
-       {
-               ServerInstance->AddCommand(&cmd);
-       }
-
-       virtual ~ModuleDeVoice()
+       ModuleDeVoice() : cmd(this)
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides voiced users with the ability to devoice themselves.", VF_VENDOR);
        }
 };