X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=1931666d1527997f9ab1394596b8485975ff73e0;hb=4047a143fc1d16350db70c94b9ea77d79de05714;hp=4a4ea68d09558ac44ebdb4d56f3024b0361c3ffa;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 4a4ea68d0..1931666d1 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -20,29 +20,22 @@
 
 
 #include "inspircd.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 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
@@ -50,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(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);
 		}
 	}
 };