aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Data
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2020-12-13 16:58:28 -0500
committerJoshua M. Boniface <joshua@boniface.me>2020-12-13 20:34:32 -0500
commit7e01cce884b70f4fa1709287bebdd2a85788a962 (patch)
tree5ad47e4d7511a68ec3ba7db63fc70195077c8425 /Jellyfin.Data
parent2e5333c1d45b3dcebabfb5bfa27b2b250b10667c (diff)
Merge pull request #4716 from OancaAndrei/syncplay-new-auth-policies
(cherry picked from commit 4f6a585424ac8fc66d1f2d5a7fc71a9e85cd23de) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
Diffstat (limited to 'Jellyfin.Data')
-rw-r--r--Jellyfin.Data/Entities/User.cs4
-rw-r--r--Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs28
-rw-r--r--Jellyfin.Data/Enums/SyncPlayUserAccessType.cs (renamed from Jellyfin.Data/Enums/SyncPlayAccess.cs)4
3 files changed, 32 insertions, 4 deletions
diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index 6d4681914..0fd8cb224 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -71,7 +71,7 @@ namespace Jellyfin.Data.Entities
EnableAutoLogin = false;
PlayDefaultAudioTrack = true;
SubtitleMode = SubtitlePlaybackMode.Default;
- SyncPlayAccess = SyncPlayAccess.CreateAndJoinGroups;
+ SyncPlayAccess = SyncPlayUserAccessType.CreateAndJoinGroups;
AddDefaultPermissions();
AddDefaultPreferences();
@@ -326,7 +326,7 @@ namespace Jellyfin.Data.Entities
/// <summary>
/// Gets or sets the level of sync play permissions this user has.
/// </summary>
- public SyncPlayAccess SyncPlayAccess { get; set; }
+ public SyncPlayUserAccessType SyncPlayAccess { get; set; }
/// <summary>
/// Gets or sets the row version.
diff --git a/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs b/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
new file mode 100644
index 000000000..8c3e6cb17
--- /dev/null
+++ b/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
@@ -0,0 +1,28 @@
+namespace Jellyfin.Data.Enums
+{
+ /// <summary>
+ /// Enum SyncPlayAccessRequirementType.
+ /// </summary>
+ public enum SyncPlayAccessRequirementType
+ {
+ /// <summary>
+ /// User must have access to SyncPlay, in some form.
+ /// </summary>
+ HasAccess = 0,
+
+ /// <summary>
+ /// User must be able to create groups.
+ /// </summary>
+ CreateGroup = 1,
+
+ /// <summary>
+ /// User must be able to join groups.
+ /// </summary>
+ JoinGroup = 2,
+
+ /// <summary>
+ /// User must be in a group.
+ /// </summary>
+ IsInGroup = 3
+ }
+}
diff --git a/Jellyfin.Data/Enums/SyncPlayAccess.cs b/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs
index 8c13b37a1..030d16fb9 100644
--- a/Jellyfin.Data/Enums/SyncPlayAccess.cs
+++ b/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs
@@ -1,9 +1,9 @@
namespace Jellyfin.Data.Enums
{
/// <summary>
- /// Enum SyncPlayAccess.
+ /// Enum SyncPlayUserAccessType.
/// </summary>
- public enum SyncPlayAccess
+ public enum SyncPlayUserAccessType
{
/// <summary>
/// User can create groups and join them.