Merge tag 'v2.0.25' into master.

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

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index de9cb73165c0f87b72244433001b3adff289e1fe..7131b49feeb295592cfaf7fd7e77dd325dae973c 100644 (file)
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.cpp
@@ -18,38 +18,24 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
-#include "main.h"
 #include "utils.h"
-#include "treeserver.h"
 #include "treesocket.h"
-
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+#include "commands.h"
 
 /**
  * SAVE command - force nick change to UID on timestamp match
  */
-bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
+CmdResult CommandSave::Handle(User* user, std::vector<std::string>& params)
 {
-       if (params.size() < 2)
-               return true;
+       User* u = ServerInstance->FindUUID(params[0]);
+       if (!u)
+               return CMD_FAILURE;
 
-       User* u = ServerInstance->FindNick(params[0]);
        time_t ts = atol(params[1].c_str());
 
-       if (u && u->age == ts)
-       {
-               Utils->DoOneToAllButSender(prefix,"SAVE",params,prefix);
-
-               if (!u->ForceNickChange(u->uuid.c_str()))
-               {
-                       ServerInstance->Users->QuitUser(u, "Nickname collision");
-               }
-       }
+       if (u->age == ts)
+               u->ChangeNick(u->uuid, SavedTimestamp);
 
-       return true;
+       return CMD_SUCCESS;
 }
-