aboutsummaryrefslogtreecommitdiff
path: root/syncapi/storage
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-12-03 11:11:46 +0000
committerGitHub <noreply@github.com>2020-12-03 11:11:46 +0000
commitbe7d8595be0533207f8942b129c16f3844550712 (patch)
tree7203824174cbec3f2bf33b4f62bfe25083de1b97 /syncapi/storage
parent2b03d24358aeac14ba7c8c63e35012d6e91c1509 (diff)
Peeking updates (#1607)
* Add unpeek * Don't allow peeks into encrypted rooms * Fix send tests * Update consumers
Diffstat (limited to 'syncapi/storage')
-rw-r--r--syncapi/storage/interface.go3
-rw-r--r--syncapi/storage/shared/syncserver.go17
2 files changed, 20 insertions, 0 deletions
diff --git a/syncapi/storage/interface.go b/syncapi/storage/interface.go
index eaa0f64f..456ca1b1 100644
--- a/syncapi/storage/interface.go
+++ b/syncapi/storage/interface.go
@@ -91,6 +91,9 @@ type Database interface {
// AddPeek adds a new peek to our DB for a given room by a given user's device.
// Returns an error if there was a problem communicating with the database.
AddPeek(ctx context.Context, RoomID, UserID, DeviceID string) (types.StreamPosition, error)
+ // DeletePeek removes an existing peek from the database for a given room by a user's device.
+ // Returns an error if there was a problem communicating with the database.
+ DeletePeek(ctx context.Context, roomID, userID, deviceID string) (sp types.StreamPosition, err error)
// DeletePeek deletes all peeks for a given room by a given user
// Returns an error if there was a problem communicating with the database.
DeletePeeks(ctx context.Context, RoomID, UserID string) (types.StreamPosition, error)
diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go
index fd8ca041..6c35a765 100644
--- a/syncapi/storage/shared/syncserver.go
+++ b/syncapi/storage/shared/syncserver.go
@@ -178,6 +178,23 @@ func (d *Database) AddPeek(
return
}
+// DeletePeeks tracks the fact that a user has stopped peeking from the specified
+// device. If the peeks was successfully deleted this returns the stream ID it was
+// stored at. Returns an error if there was a problem communicating with the database.
+func (d *Database) DeletePeek(
+ ctx context.Context, roomID, userID, deviceID string,
+) (sp types.StreamPosition, err error) {
+ err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
+ sp, err = d.Peeks.DeletePeek(ctx, txn, roomID, userID, deviceID)
+ return err
+ })
+ if err == sql.ErrNoRows {
+ sp = 0
+ err = nil
+ }
+ return
+}
+
// DeletePeeks tracks the fact that a user has stopped peeking from all devices
// If the peeks was successfully deleted this returns the stream ID it was stored at.
// Returns an error if there was a problem communicating with the database.