mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Linting

Browse source
This commit is contained in:
Kegan Dougal 2020-07-06 16:43:33 +01:00
parent 5b1a74b129
commit abf6d3a7f6
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -542,7 +542,10 @@ func (d *Database) handleRedactions(ctx context.Context, txn *sql.Tx, eventNID t
} }
// mark the event as redacted // mark the event as redacted
redactedEvent.SetUnsignedField("redacted_because", redactionEvent) err = redactedEvent.SetUnsignedField("redacted_because", redactionEvent)
if err != nil {
return err
}
if redactionsArePermanent { if redactionsArePermanent {
redactedEvent.Event = redactedEvent.Redact() redactedEvent.Event = redactedEvent.Redact()
} }
@ -556,11 +559,14 @@ func (d *Database) handleRedactions(ctx context.Context, txn *sql.Tx, eventNID t
} }
// loadRedactionPair returns both the redaction event and the redacted event, else nil. // loadRedactionPair returns both the redaction event and the redacted event, else nil.
// nolint:gocyclo
func (d *Database) loadRedactionPair( func (d *Database) loadRedactionPair(
ctx context.Context, txn *sql.Tx, eventNID types.EventNID, event gomatrixserverlib.Event, ctx context.Context, txn *sql.Tx, eventNID types.EventNID, event gomatrixserverlib.Event,
) (*types.Event, *types.Event, bool, error) { ) (*types.Event, *types.Event, bool, error) {
var redactionEvent, redactedEvent *types.Event var redactionEvent, redactedEvent *types.Event
var info *tables.RedactionInfo var info *tables.RedactionInfo
var nids map[string]types.EventNID
var evs []types.Event
var err error var err error
isRedactionEvent := event.Type() == gomatrixserverlib.MRoomRedaction && event.StateKey() == nil isRedactionEvent := event.Type() == gomatrixserverlib.MRoomRedaction && event.StateKey() == nil
if isRedactionEvent { if isRedactionEvent {
@ -577,14 +583,14 @@ func (d *Database) loadRedactionPair(
// we don't have the redacted event yet // we don't have the redacted event yet
return nil, nil, false, nil return nil, nil, false, nil
} }
nids, err := d.EventNIDs(ctx, []string{info.RedactsEventID}) nids, err = d.EventNIDs(ctx, []string{info.RedactsEventID})
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
if len(nids) == 0 { if len(nids) == 0 {
return nil, nil, false, fmt.Errorf("redaction: missing event NID being redacted: %+v", info) return nil, nil, false, fmt.Errorf("redaction: missing event NID being redacted: %+v", info)
} }
evs, err := d.Events(ctx, []types.EventNID{nids[info.RedactsEventID]}) evs, err = d.Events(ctx, []types.EventNID{nids[info.RedactsEventID]})
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
@ -606,14 +612,14 @@ func (d *Database) loadRedactionPair(
// this event is not redacted // this event is not redacted
return nil, nil, false, nil return nil, nil, false, nil
} }
nids, err := d.EventNIDs(ctx, []string{info.RedactionEventID}) nids, err = d.EventNIDs(ctx, []string{info.RedactionEventID})
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }
if len(nids) == 0 { if len(nids) == 0 {
return nil, nil, false, fmt.Errorf("redaction: missing redaction event NID: %+v", info) return nil, nil, false, fmt.Errorf("redaction: missing redaction event NID: %+v", info)
} }
evs, err := d.Events(ctx, []types.EventNID{nids[info.RedactionEventID]}) evs, err = d.Events(ctx, []types.EventNID{nids[info.RedactionEventID]})
if err != nil { if err != nil {
return nil, nil, false, err return nil, nil, false, err
} }