m_operjoin Remove duplicated code

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

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index a504afbd7b25faacf61c9c49fda3f071c0dbca4e..b3480eb55404bcc726c3187ce81f18bab7f9eeb0 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -20,6 +20,7 @@
 
 #include "inspircd.h"
 
+#include "main.h"
 #include "commands.h"
 
 CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameters)
@@ -32,17 +33,28 @@ CmdResult CommandSVSNick::Handle(User* user, std::vector<std::string>& parameter
                if (isdigit(nick[0]))
                        nick = u->uuid;
 
+               // Don't update the TS if the nick is exactly the same
+               if (u->nick == nick)
+                       return CMD_FAILURE;
+
+               time_t NickTS = ConvToInt(parameters[2]);
+               if (NickTS <= 0)
+                       return CMD_FAILURE;
+
+               ModuleSpanningTree* st = (ModuleSpanningTree*)(Module*)creator;
+               st->KeepNickTS = true;
+               u->age = NickTS;
+
                if (!u->ForceNickChange(nick))
                {
                        /* buh. UID them */
                        if (!u->ForceNickChange(u->uuid))
                        {
                                ServerInstance->Users->QuitUser(u, "Nickname collision");
-                               return CMD_SUCCESS;
                        }
                }
 
-               u->age = ConvToInt(parameters[2]);
+               st->KeepNickTS = false;
        }
 
        return CMD_SUCCESS;