X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=7d97069f540f9ad2b07d7980a97fa3158c492d03;hb=451e687f681ccab5c02a8de1a7d59b324efbfe08;hp=e345286b22c7bf37bc9fbc9c2941f9f0b4a7c2d0;hpb=74f7c865f5fd0424c49bed5af0204f194effc37e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index e345286b2..7d97069f5 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -37,11 +37,11 @@ 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)
 	{
 	}
 };
@@ -53,7 +53,8 @@ class ModuleBlockAmsg : public Module
 	SimpleExtItem<BlockedMessage> blockamsg;
 
  public:
-	ModuleBlockAmsg() : blockamsg("blockamsg", this)
+	ModuleBlockAmsg()
+		: blockamsg("blockamsg", ExtensionItem::EXT_USER, this)
 	{
 	}
 
@@ -65,16 +66,16 @@ class ModuleBlockAmsg : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
-		ForgetDelay = tag->getInt("delay", -1);
+		ForgetDelay = tag->getDuration("delay", -1);
 		std::string act = tag->getString("action");
 
-		if(act == "notice")
+		if (act == "notice")
 			action = IBLOCK_NOTICE;
-		else if(act == "noticeopers")
+		else if (act == "noticeopers")
 			action = IBLOCK_NOTICEOPERS;
-		else if(act == "silent")
+		else if (act == "silent")
 			action = IBLOCK_SILENT;
-		else if(act == "kill")
+		else if (act == "kill")
 			action = IBLOCK_KILL;
 		else
 			action = IBLOCK_KILLOPERS;
@@ -94,18 +95,18 @@ class ModuleBlockAmsg : public Module
 			if (*parameters[0].c_str() == '#')
 				targets = 1;
 
-			for(const char* c = parameters[0].c_str(); *c; c++)
+			for (const char* c = parameters[0].c_str(); *c; c++)
+			{
 				if ((*c == ',') && (*(c+1) == '#'))
 					targets++;
+			}
 
 			/* targets should now contain the number of channel targets the msg/notice was pointed at.
 			 * If the msg/notice was a PM there should be no channel targets and 'targets' should = 0.
 			 * We don't want to block PMs so...
 			 */
-			if(targets == 0)
-			{
+			if (targets == 0)
 				return MOD_RES_PASSTHRU;
-			}
 
 			// Check that this message wasn't already sent within a few seconds.
 			BlockedMessage* m = blockamsg.get(user);
@@ -115,25 +116,25 @@ 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 != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == user->chans.size())))
 			{
 				// Block it...
-				if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
+				if (action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
 					ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
 
-				if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
+				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->WriteServ( "NOTICE %s :Global message (/amsg or /ame) denied", user->nick.c_str());
+				else if (action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
+					user->WriteNotice("Global message (/amsg or /ame) denied");
 
 				return MOD_RES_DENY;
 			}
 
-			if(m)
+			if (m)
 			{
 				// 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