From b49927de3871bd84e2621e82b528f9220e8a2dbc Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 28 Apr 2020 00:44:17 -0700
Subject: [PATCH] modules/client/sync/rooms/state: Fix placement of branch from
 linear to polylog.

---
 modules/client/sync/rooms/state.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/client/sync/rooms/state.cc b/modules/client/sync/rooms/state.cc
index 899951f69..161aa796d 100644
--- a/modules/client/sync/rooms/state.cc
+++ b/modules/client/sync/rooms/state.cc
@@ -126,16 +126,6 @@ ircd::m::sync::room_state_linear_events(data &data)
 			return false;
 	}
 
-	if(is_own_membership && data.membership == "join")
-	{
-		const scope_restore data_range_first
-		{
-			data.range.first, 0UL
-		};
-
-		return room_state_polylog_events(data);
-	}
-
 	json::stack::object rooms
 	{
 		*data.out, "rooms"
@@ -163,6 +153,16 @@ ircd::m::sync::room_state_linear_events(data &data)
 		*data.out, state_member_name
 	};
 
+	if(is_own_membership && data.membership == "join")
+	{
+		const scope_restore data_range_first
+		{
+			data.range.first, 0UL
+		};
+
+		return room_state_polylog_events(data);
+	}
+
 	json::stack::array array
 	{
 		*data.out, "events"