X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=44241e82c5e83151391bb48a33cba37865f50a77;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=5b56ceabe8e7ae0f1164b1ddf7339f8b1ae13ca0;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 5b56ceabe..44241e82c 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -1,91 +1,87 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
+#include "modules/cap.h"
+#include "modules/whois.h"
 
-/* $ModDesc: Provides support for unreal-style umode +B */
+enum
+{
+	// From UnrealIRCd.
+	RPL_WHOISBOT = 335
+};
 
-/** Handles user mode +B
- */
-class BotMode : public ModeHandler
+class BotTag : public ClientProtocol::MessageTagProvider
 {
- public:
-	BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
+ private:
+	SimpleUserModeHandler& botmode;
+	Cap::Reference ctctagcap;
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+ public:
+	BotTag(Module* mod, SimpleUserModeHandler& bm)
+		: ClientProtocol::MessageTagProvider(mod)
+		, botmode(bm)
+		, ctctagcap(mod, "message-tags")
 	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('B'))
-			{
-				dest->SetMode('B',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('B'))
-			{
-				dest->SetMode('B',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-		
-		return MODEACTION_DENY;
 	}
-};
 
-class ModuleBotMode : public Module
-{
-	
-	BotMode* bm;
- public:
-	ModuleBotMode(InspIRCd* Me)
-		: Module(Me)
+	void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
 	{
-		
-		bm = new BotMode(ServerInstance);
-		if (!ServerInstance->AddMode(bm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+		User* const user = msg.GetSourceUser();
+		if (user && user->IsModeSet(botmode))
+			msg.AddTag("inspircd.org/bot", this, "");
 	}
 
-	void Implements(char* List)
+	bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE
 	{
-		List[I_OnWhois] = 1;
+		return ctctagcap.get(user);
 	}
-	
-	virtual ~ModuleBotMode()
+};
+
+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->Modes->DelMode(bm);
-		DELETE(bm);
 	}
-	
-	virtual Version GetVersion()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		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)