capab: m_kicknorejoin: Don't advertise upper bound to 2.0 servers

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

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 036a94947a6c599dfe6a3dd01f4a69a7aa3bcc25..52e512d9275563258f3eead62994195b98ba90bb 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -26,28 +26,13 @@ CmdResult CommandFMode::Handle(User* who, std::vector<std::string>& params)
 {
        time_t TS = ServerCommand::ExtractTS(params[1]);
 
-       /* Extract the TS value of the object, either User or Channel */
-       time_t ourTS;
-       if (params[0][0] == '#')
-       {
-               Channel* chan = ServerInstance->FindChan(params[0]);
-               if (!chan)
-                       /* Oops, channel doesn't exist! */
-                       return CMD_FAILURE;
-
-               ourTS = chan->age;
-       }
-       else
-       {
-               User* user = ServerInstance->FindUUID(params[0]);
-               if (!user)
-                       return CMD_FAILURE;
-
-               if (IS_SERVER(user))
-                       throw ProtocolException("Invalid target");
+       Channel* const chan = ServerInstance->FindChan(params[0]);
+       if (!chan)
+               // Channel doesn't exist
+               return CMD_FAILURE;
 
-               ourTS = user->age;
-       }
+       // Extract the TS of the channel in question
+       time_t ourTS = chan->age;
 
        /* If the TS is greater than ours, we drop the mode and don't pass it anywhere.
         */
@@ -56,16 +41,15 @@ CmdResult CommandFMode::Handle(User* who, std::vector<std::string>& params)
 
        /* TS is equal or less: Merge the mode changes into ours and pass on.
         */
-       std::vector<std::string> modelist;
-       modelist.reserve(params.size()-1);
-       /* Insert everything into modelist except the TS (params[1]) */
-       modelist.push_back(params[0]);
-       modelist.insert(modelist.end(), params.begin()+2, params.end());
+
+       // Turn modes into a Modes::ChangeList; may have more elements than max modes
+       Modes::ChangeList changelist;
+       ServerInstance->Modes.ModeParamsToChangeList(who, MODETYPE_CHANNEL, params, changelist, 2);
 
        ModeParser::ModeProcessFlag flags = ModeParser::MODE_LOCALONLY;
        if ((TS == ourTS) && IS_SERVER(who))
                flags |= ModeParser::MODE_MERGE;
 
-       ServerInstance->Modes->Process(modelist, who, flags);
+       ServerInstance->Modes->Process(who, chan, NULL, changelist, flags);
        return CMD_SUCCESS;
 }