hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 22:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into neilalexander/rsconcurrency

Browse source
This commit is contained in:
Neil Alexander 2021-02-04 12:30:09 +00:00 • committed by GitHub
commit ea4ae5d85d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 462 additions and 369 deletions
Download patch file Download diff file Expand all files Collapse all files

7
roomserver/internal/input/input_membership.go
View file

@ -107,13 +107,6 @@ func (r *Inputer) updateMembership(
return updates, nil
}
if add == nil {
// This can happen when we have rejoined a room and suddenly we have a
// divergence between the former state and the new one. We don't want to
// act on removals and apparently there are no adds, so stop here.
return updates, nil
}
mu, err := updater.MembershipUpdater(targetUserNID, r.isLocalTarget(add))
if err != nil {
return nil, err