X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=f3fa96c98ae3fba3a0cf54061c313e605c6ac806;hb=aa692dc1039b63deef7886e914ec499abe7facaf;hp=9614203c350c04a8f3d9f950c9a8085c4d3bb405;hpb=4fc2f7199e964ba5112ecdb2613c6fd5c2eee638;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 9614203c3..f3fa96c98 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -1,11 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 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
@@ -37,18 +38,18 @@ class BlockedMessage
 {
  public:
 	std::string message;
-	irc::string target;
+	std::string target;
 	time_t sent;
 
 	BlockedMessage(const std::string& msg, const std::string& tgt, time_t when)
-		: message(msg), target(tgt.c_str()), sent(when)
+		: message(msg), target(tgt), sent(when)
 	{
 	}
 };
 
 class ModuleBlockAmsg : public Module
 {
-	int ForgetDelay;
+	unsigned int ForgetDelay;
 	BlockAction action;
 	SimpleExtItem<BlockedMessage> blockamsg;
 
@@ -60,28 +61,28 @@ class ModuleBlockAmsg : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
+		return Version("Attempt to block /amsg or /ame, at least some of the irritating client scripts", VF_VENDOR);
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
-		ForgetDelay = tag->getInt("delay", -1);
+		ForgetDelay = tag->getDuration("delay", 3);
 		std::string act = tag->getString("action");
 
-		if (act == "notice")
+		if (stdalgo::string::equalsci(act, "notice"))
 			action = IBLOCK_NOTICE;
-		else if (act == "noticeopers")
+		else if (stdalgo::string::equalsci(act, "noticeopers"))
 			action = IBLOCK_NOTICEOPERS;
-		else if (act == "silent")
+		else if (stdalgo::string::equalsci(act, "silent"))
 			action = IBLOCK_SILENT;
-		else if (act == "kill")
+		else if (stdalgo::string::equalsci(act, "kill"))
 			action = IBLOCK_KILL;
 		else
 			action = IBLOCK_KILLOPERS;
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
 	{
 		// Don't do anything with unregistered users
 		if (user->registered != REG_ALL)
@@ -116,16 +117,16 @@ class ModuleBlockAmsg : public Module
 			// OR
 			// The number of target channels is equal to the number of channels the sender is on..a little suspicious.
 			// Check it's more than 1 too, or else users on one channel would have fun.
-			if ((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == user->chans.size())))
+			if ((m && (m->message == parameters[1]) && (!irc::equals(m->target, parameters[0])) && ForgetDelay && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == user->chans.size())))
 			{
 				// Block it...
 				if (action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
-					ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
+					ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame blocked", user->nick.c_str());
 
 				if (action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
 					ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)");
 				else if (action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-					user->WriteNotice("Global message (/amsg or /ame) denied");
+					user->WriteNotice("Global message (/amsg or /ame) blocked");
 
 				return MOD_RES_DENY;
 			}
@@ -134,7 +135,7 @@ class ModuleBlockAmsg : public Module
 			{
 				// If there's already a BlockedMessage allocated, use it.
 				m->message = parameters[1];
-				m->target = parameters[0].c_str();
+				m->target = parameters[0];
 				m->sent = ServerInstance->Time();
 			}
 			else