Replace OnAccessCheck with OnPreMode to remove a number of redundant checks

[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 f9a144c3ba5762097f493119a4d0277dcdb0ceb8..5140faeafec5e3a6322c3bb0b300efe8d49b1697 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -137,7 +137,7 @@ class ModuleAlias : public Module
                return word;
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                std::multimap<std::string, Alias>::iterator i, upperbound;
 
@@ -145,12 +145,12 @@ class ModuleAlias : public Module
                 * to know.
                 */
                if (user->registered != REG_ALL)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                /* We dont have any commands looking like this? Stop processing. */
                i = Aliases.find(command);
                if (i == Aliases.end())
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                /* Avoid iterating on to different aliases if no patterns match. */
                upperbound = Aliases.upper_bound(command);
 
@@ -166,7 +166,7 @@ class ModuleAlias : public Module
                        {
                                if (DoAlias(user, NULL, &(i->second), compare, original_line))
                                {
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
 
@@ -174,28 +174,25 @@ class ModuleAlias : public Module
                }
 
                // If we made it here, no aliases actually matched.
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        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;
                }
 
                // 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;
                }
 
                /* 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;
                }
 
@@ -208,24 +205,18 @@ class ModuleAlias : public Module
 
                if (fcommand.empty())
                {
-                       ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: empty (?)");
                        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;
                }
 
                // 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);
 
@@ -252,8 +243,6 @@ class ModuleAlias : public Module
 
                        i++;
                }
-
-               return;
        }