From 95e2e4d6688e4751f6007f6e4d352b93def31058 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 8 Jan 2021 13:39:12 +0000 Subject: [PATCH] Notify account data without advancing PDU position in notifier --- syncapi/consumers/clientapi.go | 2 +- syncapi/notifier/notifier.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go index 4939aaf31..f8d0d6a3f 100644 --- a/syncapi/consumers/clientapi.go +++ b/syncapi/consumers/clientapi.go @@ -97,7 +97,7 @@ func (s *OutputClientDataConsumer) onMessage(msg *sarama.ConsumerMessage) error } s.streams.AccountDataStreamProvider.Advance(pduPos) - s.notifier.OnNewEvent(nil, "", []string{string(msg.Key)}, types.StreamingToken{AccountDataPosition: pduPos}) + s.notifier.OnNewAccountData(string(msg.Key), types.StreamingToken{AccountDataPosition: pduPos}) return nil } diff --git a/syncapi/notifier/notifier.go b/syncapi/notifier/notifier.go index 47bf04bf6..f45871d36 100644 --- a/syncapi/notifier/notifier.go +++ b/syncapi/notifier/notifier.go @@ -124,6 +124,15 @@ func (n *Notifier) OnNewEvent( } } +func (n *Notifier) OnNewAccountData( + userID string, posUpdate types.StreamingToken, +) { + n.streamLock.Lock() + defer n.streamLock.Unlock() + + n.wakeupUsers([]string{userID}, nil, posUpdate) +} + func (n *Notifier) OnNewPeek( roomID, userID, deviceID string, ) {