X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=0f55793f1d722fde5ded68d82b736c94f6c453df;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=b9c7e6940a814786f104acd6a319002eabe5f74f;hpb=c3aa3125dd016c7952d9f9d4279ed7a5b3f542ec;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index b9c7e6940..0f55793f1 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -401,6 +401,37 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 		cmd = "SINFO";
 		params.insert(params.begin(), "version");
 	}
+	else if (cmd == "JOIN")
+	{
+		// 2.0 allows and forwards legacy JOINs but we don't, so translate them to FJOINs before processing
+		if ((params.size() != 1) || (IS_SERVER(who)))
+			return false; // Huh?
+
+		cmd = "FJOIN";
+		Channel* chan = ServerInstance->FindChan(params[0]);
+		params.push_back(ConvToStr(chan ? chan->age : ServerInstance->Time()));
+		params.push_back("+");
+		params.push_back(",");
+		params.back().append(who->uuid);
+		who = TreeServer::Get(who)->ServerUser;
+	}
+	else if ((cmd == "FMODE") && (params.size() >= 2))
+	{
+		// Translate user mode changes with timestamp to MODE
+		if (params[0][0] != '#')
+		{
+			User* user = ServerInstance->FindUUID(params[0]);
+			if (!user)
+				return false;
+
+			// Emulate the old nonsensical behavior
+			if (user->age < ServerCommand::ExtractTS(params[1]))
+				return false;
+
+			cmd = "MODE";
+			params.erase(params.begin()+1);
+		}
+	}
 
 	return true; // Passthru
 }