X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=5ab627c71bedc2964705dfd4a9f4f0c79039b027;hb=4e3d655dff6f8a5aed626475fbf19c2a7119c20b;hp=ed0e486e95d616dc306cbaeb0c78be6cb9018627;hpb=2d36fcb16ef3209fffbe9f4b600971a1edd2ae4b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index ed0e486e9..5ab627c71 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -60,7 +60,7 @@ 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
@@ -69,19 +69,19 @@ class ModuleBlockAmsg : public Module
 		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)
@@ -120,12 +120,12 @@ class ModuleBlockAmsg : public Module
 			{
 				// 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;
 			}