X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=44241e82c5e83151391bb48a33cba37865f50a77;hb=193eac649066bda33e693baadce6bc40181008f0;hp=c7a51beb9e08c7e7021a4b6e5277ca97bd9046c4;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index c7a51beb9..44241e82c 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -20,49 +20,68 @@
 
 
 #include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/whois.h"
 
-/* $ModDesc: Provides support for unreal-style umode +B */
-
-/** 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")
 	{
-		if (!ServerInstance->Modes->AddMode(&bm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
+	void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
+	{
+		User* const user = msg.GetSourceUser();
+		if (user && user->IsModeSet(botmode))
+			msg.AddTag("inspircd.org/bot", this, "");
+	}
 
-	virtual ~ModuleBotMode()
+	bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE
 	{
+		return ctctagcap.get(user);
 	}
+};
 
-	virtual Version GetVersion()
+class ModuleBotMode : public Module, public Whois::EventListener
+{
+ private:
+	SimpleUserModeHandler bm;
+	BotTag tag;
+
+ public:
+	ModuleBotMode()
+		: Whois::EventListener(this)
+		, bm(this, "bot", 'B')
+		, tag(this, bm)
+	{
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for unreal-style umode +B",VF_VENDOR);
+		return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR);
 	}
 
-	virtual void OnWhois(User* src, User* dst)
+	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
 	{
-		if (dst->IsModeSet('B'))
+		if (whois.GetTarget()->IsModeSet(bm))
 		{
-			ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network);
+			whois.SendLine(RPL_WHOISBOT, "is a bot on " + ServerInstance->Config->Network);
 		}
 	}
-
 };
 
-
 MODULE_INIT(ModuleBotMode)