From ae2aa9b3c57b904857f40f750ffa62675880b430 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 24 Aug 2022 18:43:23 +0200
Subject: [PATCH] Simpify GetStateDeltas again

---
 syncapi/storage/shared/syncserver.go | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go
index 4e4dcfead..b06d2c6a9 100644
--- a/syncapi/storage/shared/syncserver.go
+++ b/syncapi/storage/shared/syncserver.go
@@ -768,7 +768,7 @@ func (d *Database) GetStateDeltas(
 	}
 
 	// handle newly joined rooms and non-joined rooms
-	newlyJoinedRooms := make(map[string]struct{}, len(state))
+	newlyJoinedRooms := make(map[string]bool, len(state))
 	for roomID, stateStreamEvents := range state {
 		for _, ev := range stateStreamEvents {
 			if membership, prevMembership := getMembershipFromEvent(ev.Event, userID); membership != "" {
@@ -783,7 +783,7 @@ func (d *Database) GetStateDeltas(
 						return nil, nil, err
 					}
 					state[roomID] = s
-					newlyJoinedRooms[roomID] = struct{}{}
+					newlyJoinedRooms[roomID] = true
 					continue // we'll add this room in when we do joined rooms
 				}
 
@@ -800,15 +800,12 @@ func (d *Database) GetStateDeltas(
 
 	// Add in currently joined rooms
 	for _, joinedRoomID := range joinedRoomIDs {
-		delta := types.StateDelta{
+		deltas = append(deltas, types.StateDelta{
 			Membership:  gomatrixserverlib.Join,
 			StateEvents: d.StreamEventsToEvents(device, state[joinedRoomID]),
 			RoomID:      joinedRoomID,
-		}
-		if _, ok := newlyJoinedRooms[joinedRoomID]; ok {
-			delta.NewlyJoined = true
-		}
-		deltas = append(deltas, delta)
+			NewlyJoined: newlyJoinedRooms[joinedRoomID],
+		})
 	}
 
 	succeeded = true