X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=6bd59a78070a788eaf66b951fd84ea12dad841df;hb=e9b021cc990deaf3028cb09efa3db0040b0d62a9;hp=9055a8bf829d23bde263771ecbe44533ed8bc6d4;hpb=764bf12c10b7a03bcf62e9b72ad7e8da81811f23;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 9055a8bf8..6bd59a780 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -63,7 +63,7 @@ class ModuleAlias : public Module
 	 * 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;
 
@@ -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());
 
@@ -212,7 +212,7 @@ class ModuleAlias : public Module
 			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() + 1);
 		while (*(compare.c_str()) == ' ')
 			compare.erase(compare.begin());
 
@@ -302,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;
@@ -344,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);
 	}
 };