X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=7e8c79154e8f55cd3bfff1ad5cc9f882cd1bbe14;hb=4cc992f6c20354eef88b7652f268591daccb1b20;hp=6f27ecc095ec0947f236542f845d293cebca49d1;hpb=77730fd5f09f8fc193205654c8bba84d34365670;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 6f27ecc09..7e8c79154 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -50,6 +50,9 @@ class Alias
 
 	/** Format that must be matched for use */
 	std::string format;
+
+	/** Strip color codes before match? */
+	bool StripColor;
 };
 
 class ModuleAlias : public Module
@@ -74,37 +77,47 @@ class ModuleAlias : public Module
  public:
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
-		AllowBots = fantasy->getBool("allowbots", false);
-		fprefix = fantasy->getString("prefix", "!", 1, ServerInstance->Config->Limits.MaxLine);
-
-		Aliases.clear();
+		AliasMap newAliases;
 		ConfigTagList tags = ServerInstance->Config->ConfTags("alias");
 		for(ConfigIter i = tags.first; i != tags.second; ++i)
 		{
 			ConfigTag* tag = i->second;
 			Alias a;
 			a.AliasedCommand = tag->getString("text");
-			std::transform(a.AliasedCommand.begin(), a.AliasedCommand.end(), a.AliasedCommand.begin(), ::toupper);
+			if (a.AliasedCommand.empty())
+				throw ModuleException("<alias:text> is empty! at " + tag->getTagLocation());
+
 			tag->readString("replace", a.ReplaceFormat, true);
+			if (a.ReplaceFormat.empty())
+				throw ModuleException("<alias:replace> is empty! at " + tag->getTagLocation());
+
 			a.RequiredNick = tag->getString("requires");
 			a.ULineOnly = tag->getBool("uline");
 			a.ChannelCommand = tag->getBool("channelcommand", false);
 			a.UserCommand = tag->getBool("usercommand", true);
 			a.OperOnly = tag->getBool("operonly");
 			a.format = tag->getString("format");
-			Aliases.insert(std::make_pair(a.AliasedCommand, a));
+			a.StripColor = tag->getBool("stripcolor");
+
+			std::transform(a.AliasedCommand.begin(), a.AliasedCommand.end(), a.AliasedCommand.begin(), ::toupper);
+			newAliases.insert(std::make_pair(a.AliasedCommand, a));
 		}
+
+		ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
+		AllowBots = fantasy->getBool("allowbots", false);
+		fprefix = fantasy->getString("prefix", "!", 1, ServerInstance->Config->Limits.MaxLine);
+		Aliases.swap(newAliases);
 	}
 
 	ModuleAlias()
 		: botmode(this, "bot")
+		, active(false)
 	{
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides aliases of commands.", VF_VENDOR);
+		return Version("Provides aliases of commands", VF_VENDOR);
 	}
 
 	std::string GetVar(std::string varname, const std::string &original_line)
@@ -252,10 +265,14 @@ class ModuleAlias : public Module
 
 	int DoAlias(User *user, Channel *c, Alias *a, const std::string& compare, const std::string& safe)
 	{
+		std::string stripped(compare);
+		if (a->StripColor)
+			InspIRCd::StripColor(stripped);
+
 		/* Does it match the pattern? */
 		if (!a->format.empty())
 		{
-			if (!InspIRCd::Match(compare, a->format))
+			if (!InspIRCd::Match(stripped, a->format))
 				return 0;
 		}
 
@@ -264,7 +281,7 @@ class ModuleAlias : public Module
 
 		if (!a->RequiredNick.empty())
 		{
-			User* u = ServerInstance->FindNick(a->RequiredNick);
+			User* u = ServerInstance->FindNickOnly(a->RequiredNick);
 			if (!u)
 			{
 				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is currently unavailable. Please try again later.");
@@ -273,8 +290,8 @@ class ModuleAlias : public Module
 
 			if ((a->ULineOnly) && (!u->server->IsULine()))
 			{
-				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a u-lined server, possibly underhanded antics detected!");
-				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is an imposter! Please inform an IRC operator as soon as possible.");
+				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a U-lined server, possibly underhanded antics detected!");
+				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is not a network service! Please inform a server operator as soon as possible.");
 				return 1;
 			}
 		}