Convert AWAY to use cross-module events and clean up slightly.

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

diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp
index cdec280e1331af10255c61f405611149bbe17df5..4f53941ceb9ecb2f28c9bc6aab8ff1773b5f610f 100644 (file)
--- a/src/modules/m_spanningtree/nick.cpp
+++ b/src/modules/m_spanningtree/nick.cpp
@@ -30,13 +30,13 @@
 #include "commands.h"
 #include "treeserver.h"
 
-CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>& params)
+CmdResult CommandNick::HandleRemote(::RemoteUser* user, Params& params)
 {
        if ((isdigit(params[0][0])) && (params[0] != user->uuid))
                throw ProtocolException("Attempted to change nick to an invalid or non-matching UUID");
 
-       /* Update timestamp on user when they change nicks */
-       const time_t newts = ConvToInt(params[1]);
+       // Timestamp of the new nick
+       time_t newts = ServerCommand::ExtractTS(params[1]);
 
        /*
         * On nick messages, check that the nick doesn't already exist here.
@@ -47,12 +47,14 @@ CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>&
        {
                // 'x' is the already existing user using the same nick as params[0]
                // 'user' is the user trying to change nick to the in use nick
-               int collideret = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid);
-               if (collideret != 1)
+               bool they_change = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid, "NICK");
+               if (they_change)
                {
                        // Remote client lost, or both lost, rewrite this nick change as a change to uuid before
                        // calling ChangeNick() and forwarding the message
                        params[0] = user->uuid;
+                       params[1] = ConvToStr(CommandSave::SavedTimestamp);
+                       newts = CommandSave::SavedTimestamp;
                }
        }