X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsave.cpp;h=be3a0a687cf23c091b58c78aecc55d8ab57d306f;hb=961109ae4fde97144fdedeef25607a5b8b3ec2c2;hp=de9cb73165c0f87b72244433001b3adff289e1fe;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index de9cb7316..be3a0a687 100644
--- 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, Params& params)
 {
-	if (params.size() < 2)
-		return true;
-
-	User* u = ServerInstance->FindNick(params[0]);
-	time_t ts = atol(params[1].c_str());
+	User* u = ServerInstance->FindUUID(params[0]);
+	if (!u)
+		return CMD_FAILURE;
 
-	if (u && u->age == ts)
-	{
-		Utils->DoOneToAllButSender(prefix,"SAVE",params,prefix);
+	time_t ts = ConvToNum<time_t>(params[1]);
 
-		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;
 }
-