alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

updated nuget

Browse Source
This commit is contained in:
Luke Pulverenti
2014-04-27 15:30:12 -04:00
parent f476944d91
commit 3db92516be
6 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs
View File

@@ -149,7 +149,9 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
var notification = new NotificationRequest
{
NotificationType = GetPlaybackNotificationType(item.MediaType)
NotificationType = GetPlaybackNotificationType(item.MediaType),
ExcludeUserIds = e.Users.Select(i => i.Id.ToString("N")).ToList()
};
notification.Variables["ItemName"] = item.Name;

20
MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
View File

@@ -38,7 +38,9 @@ namespace MediaBrowser.Server.Implementations.Notifications
null :
_config.Configuration.NotificationOptions.GetOptions(notificationType);
var users = GetUserIds(request, options).Select(i => _userManager.GetUserById(new Guid(i)));
var users = GetUserIds(request, options)
.Except(request.UserIds)
.Select(i => _userManager.GetUserById(new Guid(i)));
var title = GetTitle(request, options);
@@ -81,20 +83,10 @@ namespace MediaBrowser.Server.Implementations.Notifications
}
}
if (options != null)
if (options != null && !string.IsNullOrWhiteSpace(request.NotificationType))
{
switch (options.SendToUserMode)
{
case SendToUserType.Admins:
return _userManager.Users.Where(i => i.Configuration.IsAdministrator)
.Select(i => i.Id.ToString("N"));
case SendToUserType.All:
return _userManager.Users.Select(i => i.Id.ToString("N"));
case SendToUserType.Custom:
return options.SendToUsers;
default:
throw new ArgumentException("Unrecognized SendToUserMode: " + options.SendToUserMode);
}
return _userManager.Users.Where(i => _config.Configuration.NotificationOptions.IsEnabledToSendToUser(request.NotificationType, i.Id.ToString("N"), i.Configuration))
.Select(i => i.Id.ToString("N"));
}
return new List<string>();