Remove usage of deprecated CallCommandHandler() and IsValidModuleCommand()

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 0cc293fa5d46d3e1d66ff87e79d8fe136a29b7e3..dabfc086bce5542b138d4638b074b8edbfd0acfe 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -32,7 +32,7 @@ void TreeSocket::Encap(User* who, parameterlist &params)
                if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
                {
                        parameterlist plist(params.begin() + 2, params.end());
-                       ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
+                       ServerInstance->Parser->CallHandler(params[1], plist, who);
                        // discard return value, ENCAP shall succeed even if the command does not exist
                }
                

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index b08f60925007da5be065c65758a16eed062a153b..471bbfcb970670c895ec304df5e30bcef15c44d2 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -39,10 +39,10 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
 
 void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *user)
 {
-       if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user))
+       if (!ServerInstance->Parser->IsValidCommand(command, parameters.size(), user))
                return;
 
-       /* We know it's non-null because IsValidModuleCommand returned true */
+       /* We know it's non-null because IsValidCommand returned true */
        Command* thiscmd = ServerInstance->Parser->GetHandler(command);
 
        RouteDescriptor routing = thiscmd->GetRouting(user, parameters);

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 6b12a5aafa57fb88ff91b51365d8d7506a70443d..472e79ca4c20b09fea5b078e407eee9fc3aac622 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -82,9 +82,9 @@ class CommandTban : public Command
                setban.push_back(parameters[0]);
                setban.push_back("+b");
                setban.push_back(parameters[2]);
-               // use CallCommandHandler to make it so that the user sets the mode
+               // use CallHandler to make it so that the user sets the mode
                // themselves
-               ServerInstance->CallCommandHandler("MODE",setban,user);
+               ServerInstance->Parser->CallHandler("MODE",setban,user);
                for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
                        if (!strcasecmp(i->data.c_str(), mask.c_str()))
                                goto found;

diff --git a/src/users.cpp b/src/users.cpp
index aebc66bfc48472110fb375c1dbe5a0fa1950ec28..0c6204adb1f6fb103f2f639f8c0c115b5dc83026 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -814,13 +814,13 @@ void LocalUser::FullConnect()
        std::vector<std::string> parameters;
        FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
        if (!MOD_RESULT)
-               ServerInstance->CallCommandHandler(command, parameters, this);
+               ServerInstance->Parser->CallHandler(command, parameters, this);
 
        MOD_RESULT = MOD_RES_PASSTHRU;
        command = "LUSERS";
        FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
        if (!MOD_RESULT)
-               ServerInstance->CallCommandHandler(command, parameters, this);
+               ServerInstance->Parser->CallHandler(command, parameters, this);
 
        if (ServerInstance->Config->RawLog)
                WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());