Merge pull request #965 from MediaBrowser/dev

3.0.5482.0

3 files changed, 91 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Users/UserAction.cs b/MediaBrowser.Model/Users/UserAction.cs
new file mode 100644
index 000000000..680835364
--- /dev/null
+++ b/MediaBrowser.Model/Users/UserAction.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace MediaBrowser.Model.Users
+{
+    public class UserAction
+    {
+        public string Id { get; set; }
+        public string ServerId { get; set; }
+        public string UserId { get; set; }
+        public string ItemId { get; set; }
+        public UserActionType Type { get; set; }
+        public DateTime Date { get; set; }
+        public long? PositionTicks { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Users/UserActionType.cs b/MediaBrowser.Model/Users/UserActionType.cs
new file mode 100644
index 000000000..493de6272
--- /dev/null
+++ b/MediaBrowser.Model/Users/UserActionType.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Users
+{
+    public enum UserActionType
+    {
+        PlayedItem = 0
+    }
+}
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index b458e2854..0a6a37696 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -1,8 +1,75 @@
-
+using MediaBrowser.Model.Configuration;
+
 namespace MediaBrowser.Model.Users
 {
     public class UserPolicy
     {
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is administrator.
+        /// </summary>
+        /// <value><c>true</c> if this instance is administrator; otherwise, <c>false</c>.</value>
+        public bool IsAdministrator { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is hidden.
+        /// </summary>
+        /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
+        public bool IsHidden { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is disabled.
+        /// </summary>
+        /// <value><c>true</c> if this instance is disabled; otherwise, <c>false</c>.</value>
+        public bool IsDisabled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the max parental rating.
+        /// </summary>
+        /// <value>The max parental rating.</value>
+        public int? MaxParentalRating { get; set; }
+
+        public string[] BlockedTags { get; set; }
+        public bool EnableUserPreferenceAccess { get; set; }
+        public AccessSchedule[] AccessSchedules { get; set; }
+        public UnratedItem[] BlockUnratedItems { get; set; }
+        public string[] BlockedMediaFolders { get; set; }
+        public string[] BlockedChannels { get; set; }
+        public bool EnableRemoteControlOfOtherUsers { get; set; }
+        public bool EnableSharedDeviceControl { get; set; }
+
+        public bool EnableLiveTvManagement { get; set; }
+        public bool EnableLiveTvAccess { get; set; }
+
+        public bool EnableMediaPlayback { get; set; }
+        public bool EnableContentDeletion { get; set; }
+        
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable synchronize].
+        /// </summary>
+        /// <value><c>true</c> if [enable synchronize]; otherwise, <c>false</c>.</value>
         public bool EnableSync { get; set; }
+
+        public string[] EnabledDevices { get; set; }
+        public bool EnableAllDevices { get; set; }
+
+        public UserPolicy()
+        {
+            EnableLiveTvManagement = true;
+            EnableMediaPlayback = true;
+            EnableLiveTvAccess = true;
+            EnableSharedDeviceControl = true;
+
+            BlockedMediaFolders = new string[] { };
+            BlockedTags = new string[] { };
+            BlockedChannels = new string[] { };
+            BlockUnratedItems = new UnratedItem[] { };
+
+            EnableUserPreferenceAccess = true;
+
+            AccessSchedules = new AccessSchedule[] { };
+
+            EnabledDevices = new string[] { };
+            EnableAllDevices = true;
+        }
     }
 }