X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnick.cpp;h=f640cea40600cbe4bafbe139dbf98ccfaa8b4ff3;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=686a2cc4c909437125c7f0d5167438afa93c1da1;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp
index 686a2cc4c..f640cea40 100644
--- a/src/modules/m_spanningtree/nick.cpp
+++ b/src/modules/m_spanningtree/nick.cpp
@@ -1,13 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2007-2008, 2012 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -30,34 +25,35 @@
 #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.
 	 * If it does, perform collision logic.
 	 */
-	bool callfnc = true;
 	User* x = ServerInstance->FindNickOnly(params[0]);
 	if ((x) && (x != user) && (x->registered == REG_ALL))
 	{
-		/* x is local, who is remote */
-		int collideret = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid);
-		if (collideret != 1)
+		// '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
+		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
-			// forwarding and don't call ChangeNick() because DoCollision() has done it already
+			// calling ChangeNick() and forwarding the message
 			params[0] = user->uuid;
-			callfnc = false;
+			params[1] = ConvToStr(CommandSave::SavedTimestamp);
+			newts = CommandSave::SavedTimestamp;
 		}
 	}
-	if (callfnc)
-		user->ChangeNick(params[0], newts);
+
+	user->ChangeNick(params[0], newts);
 
 	return CMD_SUCCESS;
 }