Use an oper priv instead of a config flag for overriding nonicks.

[user/henk/code/inspircd.git] / src / modules / m_alias.cpp

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index e99d9dab5b998bf1207a842ca8bd29e2e497d351..01338e8b47d3285223fe651b0b47d929ccd65e0e 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -42,9 +42,6 @@ class Alias
        /** Requires oper? */
        bool OperOnly;
 
-       /* is case sensitive params */
-       bool CaseSensitive;
-
        /* whether or not it may be executed via fantasy (default OFF) */
        bool ChannelCommand;
 
@@ -76,8 +73,7 @@ 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;
+               fprefix = fantasy->getString("prefix", "!", 1, ServerInstance->Config->Limits.MaxLine);
 
                Aliases.clear();
                ConfigTagList tags = ServerInstance->Config->ConfTags("alias");
@@ -94,7 +90,6 @@ class ModuleAlias : public Module
                        a.UserCommand = tag->getBool("usercommand", true);
                        a.OperOnly = tag->getBool("operonly");
                        a.format = tag->getString("format");
-                       a.CaseSensitive = tag->getBool("matchcase");
                        Aliases.insert(std::make_pair(a.AliasedCommand, a));
                }
        }
@@ -167,9 +162,9 @@ class ModuleAlias : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnUserMessage(User *user, void *dest, int target_type, const std::string &text, char status, const CUList &exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
        {
-               if ((target_type != TYPE_CHANNEL) || (msgtype != MSG_PRIVMSG))
+               if ((target.type != MessageTarget::TYPE_CHANNEL) || (details.type != MSG_PRIVMSG))
                {
                        return;
                }
@@ -186,11 +181,11 @@ class ModuleAlias : public Module
                        return;
                }
 
-               Channel *c = (Channel *)dest;
+               Channel *c = target.Get<Channel>();
                std::string scommand;
 
                // text is like "!moo cows bite me", we want "!moo" first
-               irc::spacesepstream ss(text);
+               irc::spacesepstream ss(details.text);
                ss.GetToken(scommand);
 
                if (scommand.size() <= fprefix.size())
@@ -212,7 +207,7 @@ class ModuleAlias : public Module
                        return;
 
                /* The parameters for the command in their original form, with the command stripped off */
-               std::string compare(text, scommand.length() + fprefix.size());
+               std::string compare(details.text, scommand.length() + fprefix.size());
                while (*(compare.c_str()) == ' ')
                        compare.erase(compare.begin());
 
@@ -221,7 +216,7 @@ class ModuleAlias : public Module
                        if (i->second.ChannelCommand)
                        {
                                // We use substr here to remove the fantasy prefix
-                               if (DoAlias(user, c, &(i->second), compare, text.substr(fprefix.size())))
+                               if (DoAlias(user, c, &(i->second), compare, details.text.substr(fprefix.size())))
                                        return;
                        }
                }
@@ -233,16 +228,8 @@ class ModuleAlias : public Module
                /* Does it match the pattern? */
                if (!a->format.empty())
                {
-                       if (a->CaseSensitive)
-                       {
-                               if (!InspIRCd::Match(compare, a->format, rfc_case_sensitive_map))
-                                       return 0;
-                       }
-                       else
-                       {
-                               if (!InspIRCd::Match(compare, a->format))
-                                       return 0;
-                       }
+                       if (!InspIRCd::Match(compare, a->format))
+                               return 0;
                }
 
                if ((a->OperOnly) && (!user->IsOper()))
@@ -297,7 +284,7 @@ class ModuleAlias : public Module
                        {
                                if (isdigit(newline[i+1]))
                                {
-                                       int len = ((i + 2 < newline.length()) && (newline[i+2] == '-')) ? 3 : 2;
+                                       size_t len = ((i + 2 < newline.length()) && (newline[i+2] == '-')) ? 3 : 2;
                                        std::string var = newline.substr(i, len);
                                        result.append(GetVar(var, original_line));
                                        i += len - 1;
@@ -309,7 +296,7 @@ class ModuleAlias : public Module
                                }
                                else if (!newline.compare(i, 5, "$host", 5))
                                {
-                                       result.append(user->host);
+                                       result.append(user->GetRealHost());
                                        i += 4;
                                }
                                else if (!newline.compare(i, 5, "$chan", 5))
@@ -325,7 +312,7 @@ class ModuleAlias : public Module
                                }
                                else if (!newline.compare(i, 6, "$vhost", 6))
                                {
-                                       result.append(user->dhost);
+                                       result.append(user->GetDisplayedHost());
                                        i += 5;
                                }
                                else if (!newline.compare(i, 12, "$requirement", 12))
@@ -356,7 +343,7 @@ class ModuleAlias : public Module
        {
                // 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_OnUserPostMessage, PRIORITY_AFTER, linkmod);
        }
 };