aboutsummaryrefslogtreecommitdiff
path: root/syncapi/consumers/roomserver.go
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/consumers/roomserver.go
parent2b03d24358aeac14ba7c8c63e35012d6e91c1509 (diff)
Peeking updates (#1607)
* Add unpeek * Don't allow peeks into encrypted rooms * Fix send tests * Update consumers
Diffstat (limited to 'syncapi/consumers/roomserver.go')
-rw-r--r--syncapi/consumers/roomserver.go22
1 files changed, 22 insertions, 0 deletions
diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index 4d453f13..11d75a68 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -105,6 +105,8 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
return s.onRetireInviteEvent(context.TODO(), *output.RetireInviteEvent)
case api.OutputTypeNewPeek:
return s.onNewPeek(context.TODO(), *output.NewPeek)
+ case api.OutputTypeRetirePeek:
+ return s.onRetirePeek(context.TODO(), *output.RetirePeek)
case api.OutputTypeRedactedEvent:
return s.onRedactEvent(context.TODO(), *output.RedactedEvent)
default:
@@ -309,6 +311,26 @@ func (s *OutputRoomEventConsumer) onNewPeek(
return nil
}
+func (s *OutputRoomEventConsumer) onRetirePeek(
+ ctx context.Context, msg api.OutputRetirePeek,
+) error {
+ sp, err := s.db.DeletePeek(ctx, msg.RoomID, msg.UserID, msg.DeviceID)
+ if err != nil {
+ // panic rather than continue with an inconsistent database
+ log.WithFields(log.Fields{
+ log.ErrorKey: err,
+ }).Panicf("roomserver output log: write peek failure")
+ return nil
+ }
+ // tell the notifier about the new peek so it knows to wake up new devices
+ s.notifier.OnRetirePeek(msg.RoomID, msg.UserID, msg.DeviceID)
+
+ // we need to wake up the users who might need to now be peeking into this room,
+ // so we send in a dummy event to trigger a wakeup
+ s.notifier.OnNewEvent(nil, msg.RoomID, nil, types.NewStreamToken(sp, 0, nil))
+ return nil
+}
+
func (s *OutputRoomEventConsumer) updateStateEvent(event *gomatrixserverlib.HeaderedEvent) (*gomatrixserverlib.HeaderedEvent, error) {
if event.StateKey() == nil {
return event, nil