X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=1741bb10ddeb67d260b96d6bc956a22e8934555b;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=0c627482aeb47260deb3e66c6852b08a8f8ed9f4;hpb=6cfc9625c0068d1a2d67fb9d08a1670a6f2358e4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 0c627482a..1741bb10d 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -99,7 +99,7 @@ class ModuleAlias : public Module
 		ReadAliases();
 		Me->Modules->Attach(I_OnPreCommand, this);
 		Me->Modules->Attach(I_OnRehash, this);
-		Me->Modules->Attach(I_OnUserPreMessage, this);
+		Me->Modules->Attach(I_OnUserMessage, this);
 
 	}
 
@@ -177,26 +177,23 @@ class ModuleAlias : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual void OnUserMessage(User *user, void *dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
 	{
 		if (target_type != TYPE_CHANNEL)
 		{
-			ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a channel msg");
-			return 0;
+			return;
 		}
 
 		// fcommands are only for local users. Spanningtree will send them back out as their original cmd.
-		if (!IS_LOCAL(user))
+		if (!user || !IS_LOCAL(user))
 		{
-			ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not local");
-			return 0;
+			return;
 		}
 
 		/* Stop here if the user is +B and allowbot is set to no. */
 		if (!AllowBots && user->IsModeSet('B'))
 		{
-			ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: user is +B and allowbot is set to no");
-			return 0;
+			return;
 		}
 
 		Channel *c = (Channel *)dest;
@@ -208,29 +205,23 @@ class ModuleAlias : public Module
 
 		if (fcommand.empty())
 		{
-			ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: empty (?)");
-			return 0; // wtfbbq
+			return; // wtfbbq
 		}
 
-		ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: looking at fcommand %s", fcommand.c_str());
-
 		// we don't want to touch non-fantasy stuff
 		if (*fcommand.c_str() != fprefix)
 		{
-			ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a fcommand");
-			return 0;
+			return;
 		}
 
 		// nor do we give a shit about the prefix
 		fcommand.erase(fcommand.begin());
 		std::transform(fcommand.begin(), fcommand.end(), fcommand.begin(), ::toupper);
-		ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: now got %s", fcommand.c_str());
-
 
 		std::multimap<std::string, Alias>::iterator i = Aliases.find(fcommand);
 
 		if (i == Aliases.end())
-			return 0;
+			return;
 
 		/* Avoid iterating on to other aliases if no patterns match */
 		std::multimap<std::string, Alias>::iterator upperbound = Aliases.upper_bound(fcommand);
@@ -241,22 +232,19 @@ class ModuleAlias : public Module
 		while (*(compare.c_str()) == ' ')
 			compare.erase(compare.begin());
 
-		std::string safe(compare);
-
-		ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: compare is %s and safe is %s", compare.c_str(), safe.c_str());
-
 		while (i != upperbound)
 		{
 			if (i->second.ChannelCommand)
 			{
-				if (DoAlias(user, c, &(i->second), compare, safe))
-					return 0;
+				// We use substr(1) here to remove the fantasy prefix
+				if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
+					return;
 			}
 
 			i++;
 		}
 
-		return 0;
+		return;
 	}
 
 
@@ -366,7 +354,7 @@ class ModuleAlias : public Module
 		else
 		{
 			/* We don't want these in a user alias */
-			SearchAndReplace(newline, std::string("$chan"), "");
+			SearchAndReplace(newline, std::string("$chan"), std::string(""));
 		}
 
 		irc::tokenstream ss(newline);
@@ -381,10 +369,17 @@ class ModuleAlias : public Module
 		ServerInstance->Parser->CallHandler(command, pars, user);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ReadAliases();
  	}
+
+	virtual 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);
+	}
 };
 
 MODULE_INIT(ModuleAlias)