mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-31 10:43:10 -06:00
Send notification data before notifying users in EDU server consumer
This commit is contained in:
parent
394ea6b60f
commit
192e9dbe2e
|
|
@ -95,6 +95,15 @@ func (s *OutputReceiptEventConsumer) onMessage(msg *sarama.ConsumerMessage) erro
|
||||||
}
|
}
|
||||||
|
|
||||||
if updated {
|
if updated {
|
||||||
|
if err := s.syncProducer.GetAndSendNotificationData(ctx, event.UserID, event.RoomID); err != nil {
|
||||||
|
log.WithFields(log.Fields{
|
||||||
|
"localpart": localpart,
|
||||||
|
"room_id": event.RoomID,
|
||||||
|
"event_id": event.EventID,
|
||||||
|
}).WithError(err).Error("pushserver EDU consumer: GetAndSendNotificationData failed")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
if err := util.NotifyUserCountsAsync(ctx, s.pgClient, localpart, s.db); err != nil {
|
if err := util.NotifyUserCountsAsync(ctx, s.pgClient, localpart, s.db); err != nil {
|
||||||
log.WithFields(log.Fields{
|
log.WithFields(log.Fields{
|
||||||
"localpart": localpart,
|
"localpart": localpart,
|
||||||
|
|
@ -104,14 +113,6 @@ func (s *OutputReceiptEventConsumer) onMessage(msg *sarama.ConsumerMessage) erro
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := s.syncProducer.GetAndSendNotificationData(ctx, event.UserID, event.RoomID); err != nil {
|
|
||||||
log.WithFields(log.Fields{
|
|
||||||
"localpart": localpart,
|
|
||||||
"room_id": event.RoomID,
|
|
||||||
"event_id": event.EventID,
|
|
||||||
}).WithError(err).Error("pushserver EDU consumer: GetAndSendNotificationData failed")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue