mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-03-24 19:16:32 +00:00
Merge branch 'master' into network-rewrite
This commit is contained in:
@@ -128,6 +128,13 @@ namespace MediaBrowser.Controller.Entities
|
||||
[JsonIgnore]
|
||||
public string Album { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the LUFS value.
|
||||
/// </summary>
|
||||
/// <value>The LUFS Value.</value>
|
||||
[JsonIgnore]
|
||||
public float LUFS { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the channel identifier.
|
||||
/// </summary>
|
||||
|
||||
@@ -66,10 +66,9 @@ namespace MediaBrowser.Controller.Playlists
|
||||
Task RemovePlaylistsAsync(Guid userId);
|
||||
|
||||
/// <summary>
|
||||
/// Updates a playlist.
|
||||
/// Saves a playlist.
|
||||
/// </summary>
|
||||
/// <param name="playlist">The updated playlist.</param>
|
||||
/// <returns>Task.</returns>
|
||||
Task UpdatePlaylistAsync(Playlist playlist);
|
||||
/// <param name="item">The playlist.</param>
|
||||
void SavePlaylistFile(Playlist item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,10 +34,13 @@ namespace MediaBrowser.Controller.Playlists
|
||||
public Playlist()
|
||||
{
|
||||
Shares = Array.Empty<Share>();
|
||||
OpenAccess = false;
|
||||
}
|
||||
|
||||
public Guid OwnerUserId { get; set; }
|
||||
|
||||
public bool OpenAccess { get; set; }
|
||||
|
||||
public Share[] Shares { get; set; }
|
||||
|
||||
[JsonIgnore]
|
||||
@@ -233,6 +236,11 @@ namespace MediaBrowser.Controller.Playlists
|
||||
return base.IsVisible(user);
|
||||
}
|
||||
|
||||
if (OpenAccess)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
var userId = user.Id;
|
||||
if (userId.Equals(OwnerUserId))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user