Move the <disabled> tag out of the core to a new module.

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

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index ca1a9d5c82a2cb0a346502c756aead935b87d00a..1931666d1527997f9ab1394596b8485975ff73e0 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -20,31 +20,22 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
 
-/* $ModDesc: Provides user mode +B to mark the user as a bot */
-
-/** Handles user mode +B
- */
-class BotMode : public SimpleUserModeHandler
+enum
 {
- public:
-       BotMode(Module* Creator) : SimpleUserModeHandler(Creator, "bot", 'B') { }
+       // From UnrealIRCd.
+       RPL_WHOISBOT = 335
 };
 
-class ModuleBotMode : public Module
+class ModuleBotMode : public Module, public Whois::EventListener
 {
-       BotMode bm;
+       SimpleUserModeHandler bm;
  public:
        ModuleBotMode()
-               : bm(this)
-       {
-       }
-
-       void init() CXX11_OVERRIDE
+               : Whois::EventListener(this)
+               , bm(this, "bot", 'B')
        {
-               ServerInstance->Modules->AddService(bm);
-               Implementation eventlist[] = { I_OnWhois };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion() CXX11_OVERRIDE
@@ -52,11 +43,11 @@ class ModuleBotMode : public Module
                return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR);
        }
 
-       void OnWhois(User* src, User* dst) CXX11_OVERRIDE
+       void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
        {
-               if (dst->IsModeSet('B'))
+               if (whois.GetTarget()->IsModeSet(bm))
                {
-                       ServerInstance->SendWhoisLine(src, dst, 335, src->nick+" "+dst->nick+" :is a bot on "+ServerInstance->Config->Network);
+                       whois.SendLine(RPL_WHOISBOT, "is a bot on " + ServerInstance->Config->Network);
                }
        }
 };