mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-10 15:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simpify GetStateDeltas again

Browse source
This commit is contained in:
Till Faelligen 2022-08-24 18:43:23 +02:00
parent 80ad177e18
commit ae2aa9b3c5
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
syncapi/storage/shared/syncserver.go
View file

@ -768,7 +768,7 @@ func (d *Database) GetStateDeltas(
} }
// handle newly joined rooms and non-joined rooms // 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 roomID, stateStreamEvents := range state {
for _, ev := range stateStreamEvents { for _, ev := range stateStreamEvents {
if membership, prevMembership := getMembershipFromEvent(ev.Event, userID); membership != "" { if membership, prevMembership := getMembershipFromEvent(ev.Event, userID); membership != "" {
@ -783,7 +783,7 @@ func (d *Database) GetStateDeltas(
return nil, nil, err return nil, nil, err
} }
state[roomID] = s state[roomID] = s
newlyJoinedRooms[roomID] = struct{}{} newlyJoinedRooms[roomID] = true
continue // we'll add this room in when we do joined rooms 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 // Add in currently joined rooms
for _, joinedRoomID := range joinedRoomIDs { for _, joinedRoomID := range joinedRoomIDs {
delta := types.StateDelta{ deltas = append(deltas, types.StateDelta{
Membership: gomatrixserverlib.Join, Membership: gomatrixserverlib.Join,
StateEvents: d.StreamEventsToEvents(device, state[joinedRoomID]), StateEvents: d.StreamEventsToEvents(device, state[joinedRoomID]),
RoomID: joinedRoomID, RoomID: joinedRoomID,
} NewlyJoined: newlyJoinedRooms[joinedRoomID],
if _, ok := newlyJoinedRooms[joinedRoomID]; ok { })
delta.NewlyJoined = true
}
deltas = append(deltas, delta)
} }
succeeded = true succeeded = true