kodev-org
/
vikunja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: process multiple reminders in the same time window (#1564) 

Resolves https://github.com/go-vikunja/vikunja/issues/1550
This commit is contained in:
kolaente 2025-09-29 10:43:12 +02:00 committed by GitHub
parent 6c7ccfdc20
commit ff8e98e6e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/models/task_reminder.go
View File

@ -19,18 +19,16 @@ package models
import (
"time"
"code.vikunja.io/api/pkg/utils"
"xorm.io/builder"
"code.vikunja.io/api/pkg/notifications"
"code.vikunja.io/api/pkg/db"
"xorm.io/xorm"
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/cron"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/notifications"
"code.vikunja.io/api/pkg/user"
"code.vikunja.io/api/pkg/utils"
"xorm.io/builder"
"xorm.io/xorm"
)
// ReminderRelation represents the date attribute of the task which a period based reminder relates to
@ -227,8 +225,6 @@ func getTasksWithRemindersDueAndTheirUsers(s *xorm.Session, now time.Time) (remi
continue
}
seen[r.TaskID][u.User.ID] = true
if u.User.Timezone == "" {
u.User.Timezone = config.GetTimeZone().String()
}
@ -245,6 +241,8 @@ func getTasksWithRemindersDueAndTheirUsers(s *xorm.Session, now time.Time) (remi
actualReminder := r.Reminder.In(tz)
if (actualReminder.After(now) && actualReminder.Before(now.Add(time.Minute))) || actualReminder.Equal(now) {
seen[r.TaskID][u.User.ID] = true
reminderNotifications = append(reminderNotifications, &ReminderDueNotification{
User: u.User,
Task: u.Task,