Merge branch 'master' into media-type

3 files changed, 337 insertions, 1 deletions

diff --git a/Jellyfin.Data/Enums/CollectionType.cs b/Jellyfin.Data/Enums/CollectionType.cs
new file mode 100644
index 0000000000..e2044a0bc8
--- /dev/null
+++ b/Jellyfin.Data/Enums/CollectionType.cs
@@ -0,0 +1,164 @@
+using Jellyfin.Data.Attributes;
+
+namespace Jellyfin.Data.Enums;
+
+/// <summary>
+/// Collection type.
+/// </summary>
+public enum CollectionType
+{
+    /// <summary>
+    /// Unknown collection.
+    /// </summary>
+    Unknown = 0,
+
+    /// <summary>
+    /// Movies collection.
+    /// </summary>
+    Movies = 1,
+
+    /// <summary>
+    /// Tv shows collection.
+    /// </summary>
+    TvShows = 2,
+
+    /// <summary>
+    /// Music collection.
+    /// </summary>
+    Music = 3,
+
+    /// <summary>
+    /// Music videos collection.
+    /// </summary>
+    MusicVideos = 4,
+
+    /// <summary>
+    /// Trailers collection.
+    /// </summary>
+    Trailers = 5,
+
+    /// <summary>
+    /// Home videos collection.
+    /// </summary>
+    HomeVideos = 6,
+
+    /// <summary>
+    /// Box sets collection.
+    /// </summary>
+    BoxSets = 7,
+
+    /// <summary>
+    /// Books collection.
+    /// </summary>
+    Books = 8,
+
+    /// <summary>
+    /// Photos collection.
+    /// </summary>
+    Photos = 9,
+
+    /// <summary>
+    /// Live tv collection.
+    /// </summary>
+    LiveTv = 10,
+
+    /// <summary>
+    /// Playlists collection.
+    /// </summary>
+    Playlists = 11,
+
+    /// <summary>
+    /// Folders collection.
+    /// </summary>
+    Folders = 12,
+
+    /// <summary>
+    /// Tv show series collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvShowSeries = 101,
+
+    /// <summary>
+    /// Tv genres collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvGenres = 102,
+
+    /// <summary>
+    /// Tv genre collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvGenre = 103,
+
+    /// <summary>
+    /// Tv latest collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvLatest = 104,
+
+    /// <summary>
+    /// Tv next up collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvNextUp = 105,
+
+    /// <summary>
+    /// Tv resume collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvResume = 106,
+
+    /// <summary>
+    /// Tv favorite series collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvFavoriteSeries = 107,
+
+    /// <summary>
+    /// Tv favorite episodes collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    TvFavoriteEpisodes = 108,
+
+    /// <summary>
+    /// Latest movies collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    MovieLatest = 109,
+
+    /// <summary>
+    /// Movies to resume collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    MovieResume = 110,
+
+    /// <summary>
+    /// Movie movie collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    MovieMovies = 111,
+
+    /// <summary>
+    /// Movie collections collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    MovieCollections = 112,
+
+    /// <summary>
+    /// Movie favorites collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    MovieFavorites = 113,
+
+    /// <summary>
+    /// Movie genres collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    MovieGenres = 114,
+
+    /// <summary>
+    /// Movie genre collection.
+    /// </summary>
+    [OpenApiIgnoreEnum]
+    MovieGenre = 115
+}
diff --git a/Jellyfin.Data/Enums/ItemSortBy.cs b/Jellyfin.Data/Enums/ItemSortBy.cs
new file mode 100644
index 0000000000..17bf1166de
--- /dev/null
+++ b/Jellyfin.Data/Enums/ItemSortBy.cs
@@ -0,0 +1,167 @@
+namespace Jellyfin.Data.Enums;
+
+/// <summary>
+/// These represent sort orders.
+/// </summary>
+public enum ItemSortBy
+{
+    /// <summary>
+    /// Default sort order.
+    /// </summary>
+    Default = 0,
+
+    /// <summary>
+    /// The aired episode order.
+    /// </summary>
+    AiredEpisodeOrder = 1,
+
+    /// <summary>
+    /// The album.
+    /// </summary>
+    Album = 2,
+
+    /// <summary>
+    /// The album artist.
+    /// </summary>
+    AlbumArtist = 3,
+
+    /// <summary>
+    /// The artist.
+    /// </summary>
+    Artist = 4,
+
+    /// <summary>
+    /// The date created.
+    /// </summary>
+    DateCreated = 5,
+
+    /// <summary>
+    /// The official rating.
+    /// </summary>
+    OfficialRating = 6,
+
+    /// <summary>
+    /// The date played.
+    /// </summary>
+    DatePlayed = 7,
+
+    /// <summary>
+    /// The premiere date.
+    /// </summary>
+    PremiereDate = 8,
+
+    /// <summary>
+    /// The start date.
+    /// </summary>
+    StartDate = 9,
+
+    /// <summary>
+    /// The sort name.
+    /// </summary>
+    SortName = 10,
+
+    /// <summary>
+    /// The name.
+    /// </summary>
+    Name = 11,
+
+    /// <summary>
+    /// The random.
+    /// </summary>
+    Random = 12,
+
+    /// <summary>
+    /// The runtime.
+    /// </summary>
+    Runtime = 13,
+
+    /// <summary>
+    /// The community rating.
+    /// </summary>
+    CommunityRating = 14,
+
+    /// <summary>
+    /// The production year.
+    /// </summary>
+    ProductionYear = 15,
+
+    /// <summary>
+    /// The play count.
+    /// </summary>
+    PlayCount = 16,
+
+    /// <summary>
+    /// The critic rating.
+    /// </summary>
+    CriticRating = 17,
+
+    /// <summary>
+    /// The IsFolder boolean.
+    /// </summary>
+    IsFolder = 18,
+
+    /// <summary>
+    /// The IsUnplayed boolean.
+    /// </summary>
+    IsUnplayed = 19,
+
+    /// <summary>
+    /// The IsPlayed boolean.
+    /// </summary>
+    IsPlayed = 20,
+
+    /// <summary>
+    /// The series sort.
+    /// </summary>
+    SeriesSortName = 21,
+
+    /// <summary>
+    /// The video bitrate.
+    /// </summary>
+    VideoBitRate = 22,
+
+    /// <summary>
+    /// The air time.
+    /// </summary>
+    AirTime = 23,
+
+    /// <summary>
+    /// The studio.
+    /// </summary>
+    Studio = 24,
+
+    /// <summary>
+    /// The IsFavouriteOrLiked boolean.
+    /// </summary>
+    IsFavoriteOrLiked = 25,
+
+    /// <summary>
+    /// The last content added date.
+    /// </summary>
+    DateLastContentAdded = 26,
+
+    /// <summary>
+    /// The series last played date.
+    /// </summary>
+    SeriesDatePlayed = 27,
+
+    /// <summary>
+    /// The parent index number.
+    /// </summary>
+    ParentIndexNumber = 28,
+
+    /// <summary>
+    /// The index number.
+    /// </summary>
+    IndexNumber = 29,
+
+    /// <summary>
+    /// The similarity score.
+    /// </summary>
+    SimilarityScore = 30,
+
+    /// <summary>
+    /// The search score.
+    /// </summary>
+    SearchScore = 31,
+}
diff --git a/Jellyfin.Data/Enums/PermissionKind.cs b/Jellyfin.Data/Enums/PermissionKind.cs
index 40280b95ef..6644f01515 100644
--- a/Jellyfin.Data/Enums/PermissionKind.cs
+++ b/Jellyfin.Data/Enums/PermissionKind.cs
@@ -113,6 +113,11 @@ namespace Jellyfin.Data.Enums
         /// <summary>
         /// Whether the user can create, modify and delete collections.
         /// </summary>
-        EnableCollectionManagement = 21
+        EnableCollectionManagement = 21,
+
+        /// <summary>
+        /// Whether the user can edit subtitles.
+        /// </summary>
+        EnableSubtitleManagement = 22
     }
 }