Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5860 from cvium/fix-notification-user-list

Browse Source 
Fix notification disabled users list

(cherry picked from commit ebe8301404332667f95e230bdb2a0f154778059d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2021-04-19 14:07:18 +02:00 committed by Joshua M. Boniface
parent 11e9173fbc
commit 1ec247f5d8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Model/Notifications/NotificationOptions.cs
View File

@ -95,16 +95,17 @@ namespace MediaBrowser.Model.Notifications
{ {
NotificationOption opt = GetOptions(notificationType); NotificationOption opt = GetOptions(notificationType);
return opt == null || return opt == null
!opt.DisabledServices.Contains(service, StringComparer.OrdinalIgnoreCase); || !opt.DisabledServices.Contains(service, StringComparer.OrdinalIgnoreCase);
} }
public bool IsEnabledToMonitorUser(string type, Guid userId) public bool IsEnabledToMonitorUser(string type, Guid userId)
{ {
NotificationOption opt = GetOptions(type); NotificationOption opt = GetOptions(type);
return opt != null && opt.Enabled && return opt != null
!opt.DisabledMonitorUsers.Contains(userId.ToString(""), StringComparer.OrdinalIgnoreCase); && opt.Enabled
&& !opt.DisabledMonitorUsers.Contains(userId.ToString("N"), StringComparer.OrdinalIgnoreCase);
} }
public bool IsEnabledToSendToUser(string type, string userId, User user) public bool IsEnabledToSendToUser(string type, string userId, User user)