From 0b7409d7bb8fe84e4f2c18a0e2340f4a69395f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= Date: Fri, 14 Jan 2022 17:28:45 +0100 Subject: [PATCH] Fix reminders websocket --- system/service/reminder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/service/reminder.go b/system/service/reminder.go index a216ed0ae..a02c1019f 100644 --- a/system/service/reminder.go +++ b/system/service/reminder.go @@ -293,7 +293,7 @@ func (svc reminder) Delete(ctx context.Context, ID uint64) (err error) { func (svc reminder) Watch(ctx context.Context) { if svc.reminderSender != nil { var ( - interval = time.Second + interval = time.Minute rTicker = time.NewTicker(interval) ) @@ -319,7 +319,7 @@ func (svc reminder) Watch(ctx context.Context) { // Send scheduled reminders to users _ = rr.Walk(func(r *types.Reminder) error { - if r.RemindAt != nil && now().Round(interval) == r.RemindAt.Round(interval) { + if r.RemindAt != nil && r.DismissedAt == nil && now().Add(interval).After(*r.RemindAt) { if err := svc.reminderSender.Send("reminder", r, r.AssignedTo); err != nil { svc.log.Error("failed to send reminder to user", zap.Error(err)) }