mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Pull latest hnt/dendrite into Harmony (#449)

Browse source 
Merge commit '46f0ed379a23768853df9c917e1eaf16899ceda3' into
austin.ellis/dendrite

Signed-off-by: Brian Meek <brian@hntlabs.com>
Signed-off-by: Austin Ellis <austin@hntlabs.com>
Co-authored-by: Brian Meek <brian@hntlabs.com>
This commit is contained in:
texuf 2022-09-15 10:42:13 -07:00 committed by GitHub
parent ad658f8aa4
commit fd4673ccb9
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
userapi/consumers/syncapi_readupdate.go
View file

@ -95,13 +95,18 @@ func (s *OutputReadUpdateConsumer) onMessage(ctx context.Context, msgs []*nats.M
log.Tracef("Received read update from sync API: %#v", read) log.Tracef("Received read update from sync API: %#v", read)
if read.Read > 0 { if read.Read > 0 {
updated, err := s.db.SetNotificationsRead(ctx, localpart, roomID, int64(read.Read), true) /*updated*/ _, err := s.db.SetNotificationsRead(ctx, localpart, roomID, int64(read.Read), true)
if err != nil { if err != nil {
log.WithError(err).Error("userapi EDU consumer") log.WithError(err).Error("userapi EDU consumer")
return false return false
} }
if updated { // zion hack - always send the notification data
// the notifications are stored in two different databases, and somehow the notification database
// prunes data, so trying to mark old notifications as read will fail, but the notification will still exist in the other db
// todo, revist when this refactor lands: https://github.com/matrix-org/dendrite/pull/2688/files
//if updated {
if err = s.syncProducer.GetAndSendNotificationData(ctx, userID, roomID); err != nil { if err = s.syncProducer.GetAndSendNotificationData(ctx, userID, roomID); err != nil {
log.WithError(err).Error("userapi EDU consumer: GetAndSendNotificationData failed") log.WithError(err).Error("userapi EDU consumer: GetAndSendNotificationData failed")
return false return false
@ -110,7 +115,7 @@ func (s *OutputReadUpdateConsumer) onMessage(ctx context.Context, msgs []*nats.M
log.WithError(err).Error("userapi EDU consumer: NotifyUserCounts failed") log.WithError(err).Error("userapi EDU consumer: NotifyUserCounts failed")
return false return false
} }
} //}
} }
if read.FullyRead > 0 { if read.FullyRead > 0 {