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 93320757c7e8249c4fae49dac12e37b6ff87f0e3..0fb4468772bb83ea62bc2d58f3e66d59c4ab1ff4 100644 (file)
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -124,12 +124,36 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params)
        /* 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->Modes->Process(modelist, srcuser, ModeParser::MODE_LOCALONLY | ModeParser::MODE_MERGE);
+               // 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);