michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
crobibero 2020-06-14 20:18:06 -06:00
parent 589735f60c
commit 524243a934
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jellyfin.Api/Controllers/NotificationsController.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using Jellyfin.Api.Models.NotificationDtos; using Jellyfin.Api.Models.NotificationDtos;
using Jellyfin.Data.Enums;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Notifications; using MediaBrowser.Controller.Notifications;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
@ -115,7 +116,10 @@ namespace Jellyfin.Api.Controllers
Description = description, Description = description,
Url = url, Url = url,
Level = level ?? NotificationLevel.Normal, Level = level ?? NotificationLevel.Normal,
UserIds = _userManager.Users.Where(i => i.Policy.IsAdministrator).Select(i => i.Id).ToArray(), UserIds = _userManager.Users
.Where(user => user.HasPermission(PermissionKind.IsAdministrator))
.Select(user => user.Id)
.ToArray(),
Date = DateTime.UtcNow, Date = DateTime.UtcNow,
}; };