The module hook is kinda required.

[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 2f82f961bc87d5ec47a35c16a359fc78752e4f07..700656a53cc0034e3933d8f83c7302f1b04c277e 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: /helpop Command, Works like Unreal helpop */
 static std::map<irc::string, std::string> helpop_map;
@@ -22,64 +19,42 @@ static std::map<irc::string, std::string> helpop_map;
 
 /** Handles user mode +h
  */
-class Helpop : public ModeHandler
+class Helpop : public SimpleUserModeHandler
 {
  public:
-       Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
-
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('h'))
-                       {
-                               dest->SetMode('h',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('h'))
-                       {
-                               dest->SetMode('h',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       Helpop(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'h') { }
 };
 
 /** Handles /HELPOP
  */
-class cmd_helpop : public command_t
+class CommandHelpop : public Command
 {
  public:
-       cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0)
+       CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
        {
                this->source = "m_helpop.so";
                syntax = "<any-text>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               irc::string parameter;
-               if (pcnt > 0)
-                       parameter = parameters[0];
+               irc::string parameter("start");
+               if (parameters.size() > 0)
+                       parameter = parameters[0].c_str();
 
-               if (pcnt == 0 || parameter == "index")
+               if (parameter == "index")
                {
                        /* iterate over all helpop items */
-                       user->WriteServ("NOTICE %s :HELPOP topic index", user->nick);
+                       user->WriteServ("NOTICE %s :HELPOP topic index", user->nick.c_str());
                        for (std::map<irc::string, std::string>::iterator iter = helpop_map.begin(); iter != helpop_map.end(); iter++)
                        {
-                               user->WriteServ("NOTICE %s :    %s", user->nick, iter->first.c_str());                          
+                               user->WriteServ("NOTICE %s :    %s", user->nick.c_str(), iter->first.c_str());
                        }
-                       user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick);
+                       user->WriteServ("NOTICE %s :*** End of HELPOP topic index", user->nick.c_str());
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick, parameters[0]);
+                       user->WriteServ("NOTICE %s :*** HELPOP for %s", user->nick.c_str(), parameter.c_str());
 
                        std::map<irc::string, std::string>::iterator iter = helpop_map.find(parameter);
 
@@ -92,12 +67,10 @@ class cmd_helpop : public command_t
                        irc::sepstream stream(value, '\n');
                        std::string token = "*";
 
-                       while ((token = stream.GetToken()) != "")
-                       {
-                               user->WriteServ("NOTICE %s :%s", user->nick, token.c_str());
-                       }
+                       while (stream.GetToken(token))
+                               user->WriteServ("NOTICE %s :%s", user->nick.c_str(), token.c_str());
 
-                       user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick);
+                       user->WriteServ("NOTICE %s :*** End of HELPOP", user->nick.c_str());
                }
 
                /* We dont want these going out over the network, return CMD_FAILURE
@@ -111,7 +84,7 @@ class ModuleHelpop : public Module
 {
        private:
                std::string  h_file;
-               cmd_helpop* mycommand;
+               CommandHelpop* mycommand;
                Helpop* ho;
 
        public:
@@ -120,10 +93,12 @@ class ModuleHelpop : public Module
                {
                        ReadConfig();
                        ho = new Helpop(ServerInstance);
-                       if (!ServerInstance->AddMode(ho, 'h'))
+                       if (!ServerInstance->Modes->AddMode(ho))
                                throw ModuleException("Could not add new modes!");
-                       mycommand = new cmd_helpop(ServerInstance);
+                       mycommand = new CommandHelpop(ServerInstance);
                        ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
                virtual void ReadConfig()
@@ -158,17 +133,13 @@ class ModuleHelpop : public Module
 
                }
 
-               void Implements(char* List)
-               {
-                       List[I_OnRehash] = List[I_OnWhois] = 1;
-               }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               virtual void OnRehash(User* user, const std::string &parameter)
                {
                        ReadConfig();
                }
 
-               virtual void OnWhois(userrec* src, userrec* dst)
+               virtual void OnWhois(User* src, User* dst)
                {
                        if (dst->IsModeSet('h'))
                        {
@@ -179,13 +150,13 @@ class ModuleHelpop : public Module
                virtual ~ModuleHelpop()
                {
                        ServerInstance->Modes->DelMode(ho);
-                       DELETE(ho);
+                       delete ho;
                }
-       
+
                virtual Version GetVersion()
                {
-                       return Version(1,1,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
+                       return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
                }
 };
 
-MODULE_INIT(ModuleHelpop);
+MODULE_INIT(ModuleHelpop)