Fix cloaking not ignoring the case of a user's hostname.

[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 7c2794789bf18b059154794f19166abee4b1d2ba..44241e82c5e83151391bb48a33cba37865f50a77 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -20,27 +20,54 @@
 
 
 #include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/whois.h"
 
-/** 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 BotTag : public ClientProtocol::MessageTagProvider
 {
-       BotMode bm;
+ private:
+       SimpleUserModeHandler& botmode;
+       Cap::Reference ctctagcap;
+
  public:
-       ModuleBotMode()
-               : bm(this)
+       BotTag(Module* mod, SimpleUserModeHandler& bm)
+               : ClientProtocol::MessageTagProvider(mod)
+               , botmode(bm)
+               , ctctagcap(mod, "message-tags")
        {
        }
 
-       void init() CXX11_OVERRIDE
+       void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
+       {
+               User* const user = msg.GetSourceUser();
+               if (user && user->IsModeSet(botmode))
+                       msg.AddTag("inspircd.org/bot", this, "");
+       }
+
+       bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE
+       {
+               return ctctagcap.get(user);
+       }
+};
+
+class ModuleBotMode : public Module, public Whois::EventListener
+{
+ private:
+       SimpleUserModeHandler bm;
+       BotTag tag;
+
+ public:
+       ModuleBotMode()
+               : Whois::EventListener(this)
+               , bm(this, "bot", 'B')
+               , tag(this, bm)
        {
-               ServerInstance->Modules->AddService(bm);
        }
 
        Version GetVersion() CXX11_OVERRIDE
@@ -48,11 +75,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(bm))
+               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);
                }
        }
 };