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

Make check more readable, also check for the sender

Browse source
This commit is contained in:
Till Faelligen 2022-06-09 18:20:04 +02:00
parent 26dd627a2a
commit 73dddea17f
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
roomserver/storage/shared/storage.go
View file

@ -832,13 +832,14 @@ func (d *Database) handleRedactions(
if err != nil { if err != nil {
return nil, "", fmt.Errorf("unable to get powerlevels for room: %w", err) return nil, "", fmt.Errorf("unable to get powerlevels for room: %w", err)
} }
redactPL := pl.Redact
redactUser := pl.UserLevel(redactionEvent.Sender()) redactUser := pl.UserLevel(redactionEvent.Sender())
// The power level of the redaction event’s sender is greater than or equal to the redact level. switch {
userAllowed := redactUser >= redactPL case redactUser >= pl.Redact:
// The domain of the redaction event’s sender matches that of the original event’s sender. // The power level of the redaction event’s sender is greater than or equal to the redact level.
originAllowed := redactedEvent.Origin() == redactionEvent.Origin() case redactedEvent.Origin() == redactionEvent.Origin() && redactedEvent.Sender() == redactionEvent.Sender():
if !originAllowed && !userAllowed { // The domain of the redaction event’s sender matches that of the original event’s sender.
default:
return nil, "", nil return nil, "", nil
} }