Merge pull request #1222 from MediaBrowser/dev

3.0.5768.7

1 files changed, 20 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Implementations/Notifications/InternalNotificationService.cs b/MediaBrowser.Server.Implementations/Notifications/InternalNotificationService.cs
index 56cb52f10..4a625f0fb 100644
--- a/MediaBrowser.Server.Implementations/Notifications/InternalNotificationService.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/InternalNotificationService.cs
@@ -3,10 +3,11 @@ using MediaBrowser.Controller.Notifications;
 using MediaBrowser.Model.Notifications;
 using System.Threading;
 using System.Threading.Tasks;
+using System;
 
 namespace MediaBrowser.Server.Implementations.Notifications
 {
-    public class InternalNotificationService : INotificationService
+    public class InternalNotificationService : INotificationService, IConfigurableNotificationService
     {
         private readonly INotificationsRepository _repo;
 
@@ -36,6 +37,24 @@ namespace MediaBrowser.Server.Implementations.Notifications
 
         public bool IsEnabledForUser(User user)
         {
+            return user.Policy.IsAdministrator;
+        }
+
+        public bool IsHidden
+        {
+            get { return true; }
+        }
+
+        public bool IsEnabled(string notificationType)
+        {
+            if (notificationType.IndexOf("playback", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return false;
+            }
+            if (notificationType.IndexOf("newlibrarycontent", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return false;
+            }
             return true;
         }
     }