X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=1076b0a9a12c88d113b27648bc13510dcaba4071;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=2b38c894e807c5a9cc66f560ec76d5f10883fe1e;hpb=3d72f37f26e2473c2ce0af7a34428d53f7adf92f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 2b38c894e..1076b0a9a 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -57,13 +57,13 @@ class Alias
 
 class ModuleAlias : public Module
 {
-	char fprefix;
+	std::string fprefix;
 
 	/* We cant use a map, there may be multiple aliases with the same name.
 	 * We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
 	 *		-- w00t
      */
-	typedef std::multimap<std::string, Alias, irc::insensitive_swo> AliasMap;
+	typedef insp::flat_multimap<std::string, Alias, irc::insensitive_swo> AliasMap;
 
 	AliasMap Aliases;
 
@@ -76,8 +76,8 @@ class ModuleAlias : public Module
 	{
 		ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
 		AllowBots = fantasy->getBool("allowbots", false);
-		std::string fpre = fantasy->getString("prefix", "!");
-		fprefix = fpre.empty() ? '!' : fpre[0];
+		std::string fpre = fantasy->getString("prefix");
+		fprefix = fpre.empty() ? "!" : fpre;
 
 		Aliases.clear();
 		ConfigTagList tags = ServerInstance->Config->ConfTags("alias");
@@ -148,7 +148,7 @@ class ModuleAlias : public Module
 			return MOD_RES_PASSTHRU;
 
 		/* The parameters for the command in their original form, with the command stripped off */
-		std::string compare = original_line.substr(command.length());
+		std::string compare(original_line, command.length());
 		while (*(compare.c_str()) == ' ')
 			compare.erase(compare.begin());
 
@@ -193,26 +193,26 @@ class ModuleAlias : public Module
 		irc::spacesepstream ss(text);
 		ss.GetToken(scommand);
 
-		if (scommand.empty())
+		if (scommand.size() <= fprefix.size())
 		{
 			return; // wtfbbq
 		}
 
 		// we don't want to touch non-fantasy stuff
-		if (*scommand.c_str() != fprefix)
+		if (scommand.compare(0, fprefix.size(), fprefix) != 0)
 		{
 			return;
 		}
 
 		// nor do we give a shit about the prefix
-		scommand.erase(scommand.begin());
+		scommand.erase(0, fprefix.size());
 
 		std::pair<AliasMap::iterator, AliasMap::iterator> iters = Aliases.equal_range(scommand);
 		if (iters.first == iters.second)
 			return;
 
 		/* The parameters for the command in their original form, with the command stripped off */
-		std::string compare = text.substr(scommand.length() + 1);
+		std::string compare(text, scommand.length() + fprefix.size());
 		while (*(compare.c_str()) == ' ')
 			compare.erase(compare.begin());
 
@@ -220,8 +220,8 @@ class ModuleAlias : public Module
 		{
 			if (i->second.ChannelCommand)
 			{
-				// We use substr(1) here to remove the fantasy prefix
-				if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
+				// We use substr here to remove the fantasy prefix
+				if (DoAlias(user, c, &(i->second), compare, text.substr(fprefix.size())))
 					return;
 			}
 		}
@@ -230,8 +230,6 @@ class ModuleAlias : public Module
 
 	int DoAlias(User *user, Channel *c, Alias *a, const std::string& compare, const std::string& safe)
 	{
-		User *u = NULL;
-
 		/* Does it match the pattern? */
 		if (!a->format.empty())
 		{
@@ -252,16 +250,14 @@ class ModuleAlias : public Module
 
 		if (!a->RequiredNick.empty())
 		{
-			u = ServerInstance->FindNick(a->RequiredNick);
+			User* u = ServerInstance->FindNick(a->RequiredNick);
 			if (!u)
 			{
 				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick + " :is currently unavailable. Please try again later.");
 				return 1;
 			}
-		}
-		if ((u != NULL) && (!a->RequiredNick.empty()) && (a->ULineOnly))
-		{
-			if (!u->server->IsULine())
+
+			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.");
@@ -306,28 +302,28 @@ class ModuleAlias : public Module
 					result.append(GetVar(var, original_line));
 					i += len - 1;
 				}
-				else if (newline.substr(i, 5) == "$nick")
+				else if (!newline.compare(i, 5, "$nick", 5))
 				{
 					result.append(user->nick);
 					i += 4;
 				}
-				else if (newline.substr(i, 5) == "$host")
+				else if (!newline.compare(i, 5, "$host", 5))
 				{
 					result.append(user->host);
 					i += 4;
 				}
-				else if (newline.substr(i, 5) == "$chan")
+				else if (!newline.compare(i, 5, "$chan", 5))
 				{
 					if (chan)
 						result.append(chan->name);
 					i += 4;
 				}
-				else if (newline.substr(i, 6) == "$ident")
+				else if (!newline.compare(i, 6, "$ident", 6))
 				{
 					result.append(user->ident);
 					i += 5;
 				}
-				else if (newline.substr(i, 6) == "$vhost")
+				else if (!newline.compare(i, 6, "$vhost", 6))
 				{
 					result.append(user->dhost);
 					i += 5;
@@ -348,14 +344,14 @@ class ModuleAlias : public Module
 		{
 			pars.push_back(token);
 		}
-		ServerInstance->Parser->CallHandler(command, pars, user);
+		ServerInstance->Parser.CallHandler(command, pars, user);
 	}
 
 	void Prioritize()
 	{
 		// Prioritise after spanningtree so that channel aliases show the alias before the effects.
 		Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserMessage, PRIORITY_AFTER, &linkmod);
+		ServerInstance->Modules->SetPriority(this, I_OnUserMessage, PRIORITY_AFTER, linkmod);
 	}
 };