github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Potential Fix for #985

Browse source
This commit is contained in:
Jamie.Rees 2017-01-25 11:50:07 +00:00
commit b7e26a3dee
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ombi.Services/Notification/NotificationEngine.cs
View file

@ -152,8 +152,12 @@ namespace Ombi.Services.Notification
var users = UserHelper.GetUsersWithFeature(Features.RequestAddedNotification).ToList(); var users = UserHelper.GetUsersWithFeature(Features.RequestAddedNotification).ToList();
Log.Debug("Notifying Users Count {0}", users.Count); Log.Debug("Notifying Users Count {0}", users.Count);
var selectedUsers = users.Select(x => x.Username).Intersect(model.RequestedUsers, StringComparer.CurrentCultureIgnoreCase); var userNamesWithFeature = users.Select(x => x.Username).ToList();
foreach (var user in selectedUsers)
var usersToNotify = userNamesWithFeature.Intersect(model.AllUsers, StringComparer.CurrentCultureIgnoreCase);
Log.Debug("Users being notified for this request count {0}", users.Count);
foreach (var user in usersToNotify)
{ {
Log.Info("Notifying user {0}", user); Log.Info("Notifying user {0}", user);
if (user.Equals(adminUsername, StringComparison.CurrentCultureIgnoreCase)) if (user.Equals(adminUsername, StringComparison.CurrentCultureIgnoreCase))

2
Ombi.Store/RequestedModel.cs
View file

@ -65,7 +65,7 @@ namespace Ombi.Store
u.Add(RequestedBy); u.Add(RequestedBy);
} }
if (RequestedUsers.Any()) if (RequestedUsers != null && RequestedUsers.Any())
{ {
u.AddRange(RequestedUsers.Where(requestedUser => requestedUser != RequestedBy)); u.AddRange(RequestedUsers.Where(requestedUser => requestedUser != RequestedBy));
} }