code tidyups

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 2b83243c110499d2ca74d6df3decbc0949670b05..37492f670ca504d074e286a1d4f3efa40ac29da9 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.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
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
@@ -25,7 +22,7 @@ class SeeWhois : public ModeHandler
  public:
        SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                /* Only opers can change other users modes */
                if (source != dest)
@@ -59,31 +56,29 @@ class ModuleShowwhois : public Module
 
  public:
 
-       ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+       ModuleShowwhois(InspIRCd* Me) : Module(Me)
        {
                
                sw = new SeeWhois(ServerInstance);
-               if (!ServerInstance->AddMode(sw, 'W'))
+               if (!ServerInstance->Modes->AddMode(sw))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnWhois };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
        ~ModuleShowwhois()
        {
                ServerInstance->Modes->DelMode(sw);
-               DELETE(sw);
+               delete sw;
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnWhois] = 1;
-       }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnWhois(userrec* source, userrec* dest)
+       virtual void OnWhois(User* source, User* dest)
        {
                if ((dest->IsModeSet('W')) && (source != dest))
                {
@@ -93,38 +88,12 @@ class ModuleShowwhois : public Module
                        }
                        else
                        {
-                               std::deque<std::string> params;
-                               params.push_back(dest->nick);
-                               std::string msg = ":";
-                               msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
-                               params.push_back(msg);
-                               Event ev((char *) &params, NULL, "send_push");
-                               ev.Send(ServerInstance);
+                               std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
+                               ServerInstance->PI->PushToClient(dest, msg);
                        }
                }
        }
 
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-       public:
-               ModuleShowwhoisFactory()
-               {
-               }
-
-               ~ModuleShowwhoisFactory()
-               {
-               }
-
-               virtual Module* CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleShowwhois(Me);
-               }
-
-};
-
-extern "C" void* init_module()
-{
-       return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)