hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-26 15:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kegan/redact-txn' into matthew/peeking

Browse source
This commit is contained in:
Matthew Hodgson 2020-09-01 21:34:01 +03:00
commit ed4b3a58a7
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
syncapi/storage/shared/syncserver.go
View file

@ -543,7 +543,13 @@ func (d *Database) GetFilter(
func (d *Database) PutFilter(
ctx context.Context, localpart string, filter *gomatrixserverlib.Filter,
) (string, error) {
return d.Filter.InsertFilter(ctx, filter, localpart)
var filterID string
var err error
err = d.Writer.Do(nil, nil, func(txn *sql.Tx) error {
filterID, err = d.Filter.InsertFilter(ctx, filter, localpart)
return err
})
return filterID, err
}
func (d *Database) IncrementalSync(
@ -607,7 +613,10 @@ func (d *Database) RedactEvent(ctx context.Context, redactedEventID string, reda
}
newEvent := ev.Headered(redactedBecause.RoomVersion)
return d.OutputEvents.UpdateEventJSON(ctx, &newEvent)
err = d.Writer.Do(nil, nil, func(txn *sql.Tx) error {
return d.OutputEvents.UpdateEventJSON(ctx, &newEvent)
})
return err
}
// getResponseWithPDUsForCompleteSync creates a response and adds all PDUs needed