X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=1544562c060b5fb061e8c7b5417d452cceb50d7f;hb=4132a44396d8fa3d23f87b5cbea5b928aa09769f;hp=67f692b8623077a4fd40b77a42f163f5346bcc86;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 67f692b86..1544562c0 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,20 +21,19 @@
 
 #include "inspircd.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)
+		: Whois::EventListener(this)
+		, bm(this, "bot", 'B')
 	{
 	}
 
@@ -43,11 +42,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, dst->nick+" :is a bot on "+ServerInstance->Config->Network);
+			whois.SendLine(RPL_WHOISBOT, "is a bot on " + ServerInstance->Config->Network);
 		}
 	}
 };