Add the server id to the Server class.

[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 7be904faf7552bb10b2185cc25989f507f2c2b9f..a15b5ddc219b0b4c96d40148eba494b81bb8c0a1 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -21,57 +21,35 @@
 #include "inspircd.h"
 #include "commands.h"
 
-/** FMODE command - server mode with timestamp checks */
-CmdResult CommandFMode::Handle(const std::vector<std::string>& params, User *who)
+/** FMODE command - channel mode change with timestamp checks */
+CmdResult CommandFMode::Handle(User* who, Params& params)
 {
-       time_t TS = ConvToInt(params[1]);
-       if (!TS)
-       {
-               ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropping link.");
-               ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq, dropping link.", who->server.c_str());
-               return CMD_INVALID;
-       }
+       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;
+       Channel* const chan = ServerInstance->FindChan(params[0]);
+       if (!chan)
+               // Channel doesn't exist
+               return CMD_FAILURE;
 
-               ourTS = chan->age;
-       }
-       else
-       {
-               User* user = ServerInstance->FindUUID(params[0]);
-               if (!user)
-                       return CMD_FAILURE;
+       // Extract the TS of the channel in question
+       time_t ourTS = chan->age;
 
-               if (IS_SERVER(user))
-                       return CMD_INVALID;
-
-               ourTS = user->age;
-       }
-
-       /* TS is equal or less: Merge the mode changes into ours and pass on.
+       /* If the TS is greater than ours, we drop the mode and don't pass it anywhere.
         */
-       if (TS <= ourTS)
-       {
-               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());
+       if (TS > ourTS)
+               return CMD_FAILURE;
 
-               bool merge = (TS == ourTS) && IS_SERVER(who);
-               ServerInstance->Modes->Process(modelist, who, merge);
-               return CMD_SUCCESS;
-       }
-       /* If the TS is greater than ours, we drop the mode and dont pass it anywhere.
+       /* TS is equal or less: apply the mode change locally and forward the message
         */
-       return CMD_FAILURE;
-}
 
+       // 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(who, chan, NULL, changelist, flags);
+       return CMD_SUCCESS;
+}