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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 39d19b2bc..1741bb10d 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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;
 	}
 
 
@@ -295,7 +283,7 @@ class ModuleAlias : public Module
 		{
 			if (!ServerInstance->ULine(u->server))
 			{
-				ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
+				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
 				user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
 				return 1;
 			}
@@ -363,6 +351,11 @@ class ModuleAlias : public Module
 			/* Channel specific variables */
 			SearchAndReplace(newline, std::string("$chan"), c->name);
 		}
+		else
+		{
+			/* We don't want these in a user alias */
+			SearchAndReplace(newline, std::string("$chan"), std::string(""));
+		}
 
 		irc::tokenstream ss(newline);
 		pars.clear();
@@ -376,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)