Fix Windows build and a few more problems

[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 b25444cdacc657878566c602c4f607e602311eda..93320757c7e8249c4fae49dac12e37b6ff87f0e3 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -26,9 +26,8 @@
 #include "treesocket.h"
 
 /** FJOIN, almost identical to TS6 SJOIN, except for nicklist handling. */
-CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *srcuser)
+CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
 {
-       SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
        /* 1.1+ FJOIN works as follows:
         *
         * Each FJOIN is sent along with a timestamp, and the side with the lowest
@@ -73,7 +72,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(MODNAME, 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,11 +129,11 @@ 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);
-       TreeSocket* src_socket = Utils->FindServer(srcuser->server)->GetRoute()->GetSocket();
+       TreeSocket* src_socket = Utils->FindServer(srcuser->server)->GetSocket();
 
        /* Now, process every 'modes,uuid' pair */
        irc::tokenstream users(*params.rbegin());
@@ -167,7 +166,6 @@ bool CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeSocket* src_
        }
 
        /* Check that the user's 'direction' is correct */
-       SpanningTreeUtilities* Utils = ((ModuleSpanningTree*)(Module*)creator)->Utils;
        TreeServer* route_back_again = Utils->BestRouteTo(who->server);
        if ((!route_back_again) || (route_back_again->GetSocket() != src_socket))
        {
@@ -222,7 +220,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());
        }
 }