fix(reminders): notify subscribed users as well
Resolves https://community.vikunja.io/t/no-reminder-notification-by-e-mail-from-my-colleague/2779 (cherry picked from commit 34ac29fcceec0b9f5f0c3c9fb22c015858f357d5)
This commit is contained in:
parent
95ef4e1045
commit
313b99e296
@ -124,6 +124,39 @@ func getTaskUsersForTasks(s *xorm.Session, taskIDs []int64, cond builder.Cond) (
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
subscriptions, err := GetSubscriptionsForEntities(s, SubscriptionEntityTask, taskIDs)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
subscriberIDs := []int64{}
|
||||||
|
for _, subs := range subscriptions {
|
||||||
|
for _, sub := range subs {
|
||||||
|
subscriberIDs = append(subscriberIDs, sub.UserID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
subscribers, err := user.GetUsersByCond(s, builder.And(
|
||||||
|
builder.In("id", subscriberIDs),
|
||||||
|
cond,
|
||||||
|
))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
for taskID, subs := range subscriptions {
|
||||||
|
for _, sub := range subs {
|
||||||
|
u, has := subscribers[sub.UserID]
|
||||||
|
if !has {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
taskUsers = append(taskUsers, &taskUser{
|
||||||
|
Task: taskMap[taskID],
|
||||||
|
User: u,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user