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

Copy invites as well as bans

Browse source
This commit is contained in:
Neil Alexander 2022-04-04 17:20:06 +01:00
parent 4693f00a26
commit 5d62b8f2cd
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
roomserver/internal/perform/perform_upgrade.go
View file

@ -346,11 +346,18 @@ func (r *Upgrader) generateInitialEvents(ctx context.Context, oldRoom *api.Query
continue continue
} }
if event.Type() == gomatrixserverlib.MRoomMember && !event.StateKeyEquals(userID) { if event.Type() == gomatrixserverlib.MRoomMember && !event.StateKeyEquals(userID) {
// With the exception of bans which we do want to copy, we should ignore // With the exception of bans and invites which we do want to copy, we
// membership events that aren't our own, as event auth will prevent us // should ignore membership events that aren't our own, as event auth will
// from being able to create membership events on behalf of other users // prevent us from being able to create membership events on behalf of other
// anyway unless they are invites or bans. // users anyway unless they are invites or bans.
if membership, err := event.Membership(); err == nil && membership != gomatrixserverlib.Ban { membership, err := event.Membership()
if err != nil {
continue
}
switch membership {
case gomatrixserverlib.Ban:
case gomatrixserverlib.Invite:
default:
continue continue
} }
} }