X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=a31d51d3d9a2c740b20cbf5c3fbab47bd4a54769;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=e1f8a689444481907f8fdf9a9057643b6ab2255d;hpb=44489ddf7e90413d8f656aea24d74445bab227af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index e1f8a6894..a31d51d3d 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -25,6 +25,7 @@
 
 #include "inspircd.h"
 #include "modules/ctctags.h"
+#include "modules/who.h"
 #include "modules/whois.h"
 
 enum
@@ -60,20 +61,62 @@ class BotTag : public ClientProtocol::MessageTagProvider
 	}
 };
 
-class ModuleBotMode : public Module, public Whois::EventListener
+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("Adds user mode B (bot) which marks users with it set as bots in their /WHOIS response.",VF_VENDOR);