Introduce ModeProcessFlags, can be passed to ModeParser::Process() to indicate local...

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

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 5e58a164f2850a3678a8d5bf2bc94edbf156b82a..faf5345427a6e2828a27e34c4d91e62fef015f89 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -73,7 +73,7 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src
        time_t TS = ConvToInt(params[1]);
        if (!TS)
        {
-               ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"*** BUG? *** TS of 0 sent to FJOIN. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
+               ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "*** BUG? *** TS of 0 sent to FJOIN. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
                ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FJOIN with a TS of zero. Total craq. Command was dropped.", srcuser->server.c_str());
                return CMD_INVALID;
        }
@@ -130,7 +130,7 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src
 
                /* Remember, params[params.size() - 1] is userlist, and we don't want to apply *that* */
                modelist.insert(modelist.end(), params.begin()+2, params.end()-1);
-               ServerInstance->SendMode(modelist, srcuser);
+               ServerInstance->Modes->Process(modelist, srcuser, ModeParser::MODE_LOCALONLY | ModeParser::MODE_MERGE);
        }
 
        irc::modestacker modestack(true);
@@ -209,7 +209,7 @@ void CommandFJoin::RemoveStatus(Channel* c)
                 * for this function we require tidyness instead. Fixes bug #493
                 */
                if (mh)
-                       mh->RemoveMode(c, &stack);
+                       mh->RemoveMode(c, stack);
        }
 
        ApplyModeStack(ServerInstance->FakeClient, c, stack);
@@ -222,7 +222,7 @@ void CommandFJoin::ApplyModeStack(User* srcuser, Channel* c, irc::modestacker& s
 
        while (stack.GetStackedLine(stackresult))
        {
-               ServerInstance->SendMode(stackresult, srcuser);
+               ServerInstance->Modes->Process(stackresult, srcuser, ModeParser::MODE_LOCALONLY);
                stackresult.erase(stackresult.begin() + 1, stackresult.end());
        }
 }