Merge branch 'master' into nullable3

This commit is contained in:
Bond_009
2020-05-27 20:49:18 +02:00
533 changed files with 15170 additions and 7652 deletions

View File

@@ -2,7 +2,7 @@
#pragma warning disable CS1591
using System;
using MediaBrowser.Model.Extensions;
using System.Linq;
using MediaBrowser.Model.Users;
namespace MediaBrowser.Model.Notifications
@@ -93,7 +93,7 @@ namespace MediaBrowser.Model.Notifications
NotificationOption opt = GetOptions(notificationType);
return opt == null ||
!ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
!opt.DisabledServices.Contains(service, StringComparer.OrdinalIgnoreCase);
}
public bool IsEnabledToMonitorUser(string type, Guid userId)
@@ -101,7 +101,7 @@ namespace MediaBrowser.Model.Notifications
NotificationOption opt = GetOptions(type);
return opt != null && opt.Enabled &&
!ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId.ToString(""));
!opt.DisabledMonitorUsers.Contains(userId.ToString(""), StringComparer.OrdinalIgnoreCase);
}
public bool IsEnabledToSendToUser(string type, string userId, UserPolicy userPolicy)
@@ -120,7 +120,7 @@ namespace MediaBrowser.Model.Notifications
return true;
}
return ListHelper.ContainsIgnoreCase(opt.SendToUsers, userId);
return opt.SendToUsers.Contains(userId, StringComparer.OrdinalIgnoreCase);
}
return false;