X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=a31d51d3d9a2c740b20cbf5c3fbab47bd4a54769;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=1931666d1527997f9ab1394596b8485975ff73e0;hpb=77730fd5f09f8fc193205654c8bba84d34365670;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 1931666d1..a31d51d3d 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -20,6 +24,8 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
+#include "modules/who.h"
 #include "modules/whois.h"
 
 enum
@@ -28,19 +34,92 @@ enum
 	RPL_WHOISBOT = 335
 };
 
-class ModuleBotMode : public Module, public Whois::EventListener
+class BotTag : public ClientProtocol::MessageTagProvider
 {
+ private:
+	SimpleUserModeHandler& botmode;
+	CTCTags::CapReference ctctagcap;
+
+ public:
+	BotTag(Module* mod, SimpleUserModeHandler& bm)
+		: ClientProtocol::MessageTagProvider(mod)
+		, botmode(bm)
+		, ctctagcap(mod)
+	{
+	}
+
+	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 Who::EventListener
+	, public Whois::EventListener
+{
+ private:
 	SimpleUserModeHandler bm;
+	BotTag tag;
+	bool forcenotice;
+
  public:
 	ModuleBotMode()
-		: Whois::EventListener(this)
+		: Who::EventListener(this)
+		, Whois::EventListener(this)
 		, bm(this, "bot", 'B')
+		, tag(this, bm)
+	{
+	}
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		forcenotice = ServerInstance->Config->ConfValue("botmode")->getBool("forcenotice");
+	}
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+	{
+		tokens["BOT"] = ConvToStr(bm.GetModeChar());
+	}
+
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
+		// Allow sending if forcenotice is off, the user is not a bot, or if the message is a notice.
+		if (!forcenotice || !user->IsModeSet(bm) || details.type == MSG_NOTICE)
+			return MOD_RES_PASSTHRU;
+
+		// Allow sending PRIVMSGs to services pseudoclients.
+		if (target.type == MessageTarget::TYPE_USER && target.Get<User>()->server->IsULine())
+			return MOD_RES_PASSTHRU;
+
+		// Force the message to be broadcast as a NOTICE.
+		details.type = MSG_NOTICE;
+		return MOD_RES_PASSTHRU;
+	}
+
+	ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
+	{
+		size_t flag_index;
+		if (!request.GetFieldIndex('f', flag_index))
+			return MOD_RES_PASSTHRU;
+
+		if (user->IsModeSet(bm))
+			numeric.GetParams()[flag_index].push_back('B');
+
+		return MOD_RES_PASSTHRU;
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR);
+		return Version("Adds user mode B (bot) which marks users with it set as bots in their /WHOIS response.",VF_VENDOR);
 	}
 
 	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE