m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index dc53f2f0c22d74baa3584a1719108d747914c3e1..c2659f6aa53909b7e28b175d84bf804de392f7f9 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -25,8 +25,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the SWHOIS command which allows setting of arbitrary WHOIS lines */
-
 /** Handle /SWHOIS
  */
 class CommandSwhois : public Command
@@ -36,15 +34,14 @@ class CommandSwhois : public Command
        CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois("swhois", Creator)
        {
                flags_needed = 'o'; syntax = "<nick> :<swhois>";
-               ServerInstance->Extensions.Register(&swhois);
-               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
+               TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
        CmdResult Handle(const std::vector<std::string> &parameters, User* user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
 
-               if (!dest)
+               if ((!dest) || (IS_SERVER(dest))) // allow setting swhois using SWHOIS before reg
                {
                        user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
@@ -89,13 +86,16 @@ class ModuleSWhois : public Module
  public:
        ModuleSWhois() : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               Implementation eventlist[] = { I_OnWhoisLine, I_OnPostCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+       }
+
+       void init() CXX11_OVERRIDE
+       {
+               ServerInstance->Modules->AddService(cmd);
+               ServerInstance->Modules->AddService(cmd.swhois);
        }
 
        // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
        {
                /* We use this and not OnWhois because this triggers for remote, too */
                if (numeric == 312)
@@ -112,11 +112,10 @@ class ModuleSWhois : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnPostCommand(const std::string &command, const std::vector<std::string> &params, LocalUser *user, CmdResult result, const std::string &original_line)
+       void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE
        {
-               if ((command != "OPER") || (result != CMD_SUCCESS))
+               if (!IS_LOCAL(user))
                        return;
-               ConfigReader Conf;
 
                std::string swhois = user->oper->getConfig("swhois");
 
@@ -127,11 +126,7 @@ class ModuleSWhois : public Module
                ServerInstance->PI->SendMetaData(user, "swhois", swhois);
        }
 
-       ~ModuleSWhois()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
        }