diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2020-09-10 14:39:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 14:39:18 +0100 |
| commit | 39507bacc3dbfc532e0d69b42957c87f27af4c77 (patch) | |
| tree | 7ad845e1b25e03e7b7d7cd2d49278fe843c2ff86 /roomserver/storage | |
| parent | 35564dd73c48b16b97cd1a972a9b9bc65ec6d7ef (diff) | |
Peeking via MSC2753 (#1370)
Initial implementation of MSC2753, as tested by https://github.com/matrix-org/sytest/pull/944.
Doesn't yet handle unpeeks, peeked EDUs, or history viz changing during a peek - these will follow.
https://github.com/matrix-org/dendrite/pull/1370 has full details.
Diffstat (limited to 'roomserver/storage')
| -rw-r--r-- | roomserver/storage/shared/storage.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index 5c18c725..262b0f2f 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -359,7 +359,7 @@ func (d *Database) MembershipUpdater( var updater *MembershipUpdater _ = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error { updater, err = NewMembershipUpdater(ctx, d, txn, roomID, targetUserID, targetLocal, roomVersion) - return nil + return err }) return updater, err } @@ -374,7 +374,7 @@ func (d *Database) GetLatestEventsForUpdate( var updater *LatestEventsUpdater _ = d.Writer.Do(d.DB, txn, func(txn *sql.Tx) error { updater, err = NewLatestEventsUpdater(ctx, d, txn, roomInfo) - return nil + return err }) return updater, err } |