Rework the example services aliases.

- Split common stuff into a generic configuration file.
- Reserve all nicknames used by services by default.
- Exempt all services clients from filtering.
- Add missing aliases for services pseudoclients.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 9184b10af..c6e53f0cf 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -271,7 +271,7 @@ class ModuleAlias : public Module
 
 		if (crlf == std::string::npos)
 		{
-			DoCommand(a->ReplaceFormat, user, c, safe);
+			DoCommand(a->ReplaceFormat, user, c, safe, a);
 			return 1;
 		}
 		else
@@ -280,13 +280,13 @@ class ModuleAlias : public Module
 			std::string scommand;
 			while (commands.GetToken(scommand))
 			{
-				DoCommand(scommand, user, c, safe);
+				DoCommand(scommand, user, c, safe, a);
 			}
 			return 1;
 		}
 	}
 
-	void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line)
+	void DoCommand(const std::string& newline, User* user, Channel *chan, const std::string &original_line, Alias* a)
 	{
 		std::string result;
 		result.reserve(newline.length());
@@ -328,6 +328,11 @@ class ModuleAlias : public Module
 					result.append(user->dhost);
 					i += 5;
 				}
+				else if (!newline.compare(i, 12, "$requirement", 12))
+				{
+					result.append(a->RequiredNick);
+					i += 11;
+				}
 				else
 					result.push_back(c);
 			}