mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-25 07:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into neilalexander/rewrite

Browse source
This commit is contained in:
Neil Alexander 2020-10-21 16:22:45 +01:00
parent c01632cb6f 04dc019e5e
commit 22f0f9f4e7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/internal/input/input_latest_events.go
View file

@ -163,6 +163,8 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() error {
if updates, err = u.api.updateMemberships(u.ctx, u.updater, u.removed, u.added); err != nil { if updates, err = u.api.updateMemberships(u.ctx, u.updater, u.removed, u.added); err != nil {
return fmt.Errorf("u.api.updateMemberships: %w", err) return fmt.Errorf("u.api.updateMemberships: %w", err)
} }
} else {
u.newStateNID = u.oldStateNID
} }
update, err := u.makeOutputNewRoomEvent() update, err := u.makeOutputNewRoomEvent()