Merge branch 'insp20' into master.

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

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 2fe958a71c2c96fa4c7bc71be7e0741a4c667c48..f8829857681b37b9a775ab2f35c6f9cac6e952ab 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -22,6 +22,13 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
+
+enum
+{
+       // From UnrealIRCd.
+       RPL_WHOISHELPOP = 310
+};
 
 typedef std::map<std::string, std::string, irc::insensitive_swo> HelpopMap;
 static HelpopMap helpop_map;
@@ -50,22 +57,22 @@ class CommandHelpop : public Command
                syntax = "<any-text>";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                const std::string& parameter = (!parameters.empty() ? parameters[0] : startkey);
 
                if (parameter == "index")
                {
                        /* iterate over all helpop items */
-                       user->WriteNumeric(290, ":HELPOP topic index");
+                       user->WriteNumeric(290, "HELPOP topic index");
                        for (HelpopMap::const_iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++)
-                               user->WriteNumeric(292, ":  %s", iter->first.c_str());
-                       user->WriteNumeric(292, ":*** End of HELPOP topic index");
+                               user->WriteNumeric(292, InspIRCd::Format("  %s", iter->first.c_str()));
+                       user->WriteNumeric(292, "*** End of HELPOP topic index");
                }
                else
                {
-                       user->WriteNumeric(290, ":*** HELPOP for %s", parameter.c_str());
-                       user->WriteNumeric(292, ": -");
+                       user->WriteNumeric(290, InspIRCd::Format("*** HELPOP for %s", parameter.c_str()));
+                       user->WriteNumeric(292, " -");
 
                        HelpopMap::const_iterator iter = helpop_map.find(parameter);
 
@@ -82,26 +89,28 @@ class CommandHelpop : public Command
                        {
                                // Writing a blank line will not work with some clients
                                if (token.empty())
-                                       user->WriteNumeric(292, ": ");
+                                       user->WriteNumeric(292, ' ');
                                else
-                                       user->WriteNumeric(292, ":%s", token.c_str());
+                                       user->WriteNumeric(292, token);
                        }
 
-                       user->WriteNumeric(292, ": -");
-                       user->WriteNumeric(292, ":*** End of HELPOP");
+                       user->WriteNumeric(292, " -");
+                       user->WriteNumeric(292, "*** End of HELPOP");
                }
                return CMD_SUCCESS;
        }
 };
 
-class ModuleHelpop : public Module
+class ModuleHelpop : public Module, public Whois::EventListener
 {
                CommandHelpop cmd;
                Helpop ho;
 
        public:
                ModuleHelpop()
-                       : cmd(this), ho(this)
+                       : Whois::EventListener(this)
+                       , cmd(this)
+                       , ho(this)
                {
                }
 
@@ -139,11 +148,11 @@ class ModuleHelpop : public Module
                        helpop_map.swap(help);
                }
 
-               void OnWhois(User* src, User* dst) CXX11_OVERRIDE
+               void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
                {
-                       if (dst->IsModeSet(ho))
+                       if (whois.GetTarget()->IsModeSet(ho))
                        {
-                               ServerInstance->SendWhoisLine(src, dst, 310, dst->nick+" :is available for help.");
+                               whois.SendLine(RPL_WHOISHELPOP, "is available for help.");
                        }
                }