Merge insp20

[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..0fb4468772bb83ea62bc2d58f3e66d59c4ab1ff4 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;
        }
@@ -125,16 +124,40 @@ CmdResult CommandFJoin::Handle(const std::vector<std::string>& params, User *src
        /* First up, apply their channel modes if they won the TS war */
        if (apply_other_sides_modes)
        {
+               // Need to use a modestacker here due to maxmodes
+               irc::modestacker stack(true);
+               std::vector<std::string>::const_iterator paramit = params.begin() + 3;
+               const std::vector<std::string>::const_iterator lastparamit = ((params.size() > 3) ? (params.end() - 1) : params.end());
+               for (std::string::const_iterator i = params[2].begin(); i != params[2].end(); ++i)
+               {
+                       ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
+                       if (!mh)
+                               continue;
+
+                       std::string modeparam;
+                       if ((paramit != lastparamit) && (mh->GetNumParams(true)))
+                       {
+                               modeparam = *paramit;
+                               ++paramit;
+                       }
+
+                       stack.Push(*i, modeparam);
+               }
+
                std::vector<std::string> modelist;
-               modelist.push_back(channel);
 
-               /* 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);
+               // Mode parser needs to know what channel to act on.
+               modelist.push_back(params[0]);
+
+               while (stack.GetStackedLine(modelist))
+               {
+                       ServerInstance->Modes->Process(modelist, srcuser, ModeParser::MODE_LOCALONLY | ModeParser::MODE_MERGE);
+                       modelist.erase(modelist.begin() + 1, modelist.end());
+               }
        }
 
        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 +190,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))
        {
@@ -209,7 +231,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 +244,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());
        }
 }