Merge pull request #9818 from Shadowghost/fixes
This commit is contained in:
commit
6dca53047f
|
@ -1264,7 +1264,14 @@ namespace Emby.Server.Implementations.Library
|
|||
AddUserToQuery(query, query.User, allowExternalContent);
|
||||
}
|
||||
|
||||
return _itemRepository.GetItemList(query);
|
||||
var itemList = _itemRepository.GetItemList(query);
|
||||
var user = query.User;
|
||||
if (user is not null)
|
||||
{
|
||||
return itemList.Where(i => i.IsVisible(user)).ToList();
|
||||
}
|
||||
|
||||
return itemList;
|
||||
}
|
||||
|
||||
public List<BaseItem> GetItemList(InternalItemsQuery query)
|
||||
|
|
|
@ -42,7 +42,7 @@ namespace Emby.Server.Implementations.Playlists
|
|||
|
||||
query.Recursive = true;
|
||||
query.IncludeItemTypes = new[] { BaseItemKind.Playlist };
|
||||
return LibraryManager.GetItemsResult(query);
|
||||
return QueryWithPostFiltering2(query);
|
||||
}
|
||||
|
||||
public override string GetClientTypeName()
|
||||
|
|
|
@ -512,12 +512,10 @@ public class ItemsController : BaseJellyfinApiController
|
|||
result = new QueryResult<BaseItem>(itemsArray);
|
||||
}
|
||||
|
||||
// result might include items not accessible by the user, DtoService will remove them
|
||||
var accessibleItems = _dtoService.GetBaseItemDtos(result.Items, dtoOptions, user);
|
||||
return new QueryResult<BaseItemDto>(
|
||||
startIndex,
|
||||
accessibleItems.Count,
|
||||
accessibleItems);
|
||||
result.TotalRecordCount,
|
||||
_dtoService.GetBaseItemDtos(result.Items, dtoOptions, user));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -730,7 +730,7 @@ namespace MediaBrowser.Controller.Entities
|
|||
return LibraryManager.GetItemsResult(query);
|
||||
}
|
||||
|
||||
private QueryResult<BaseItem> QueryWithPostFiltering2(InternalItemsQuery query)
|
||||
protected QueryResult<BaseItem> QueryWithPostFiltering2(InternalItemsQuery query)
|
||||
{
|
||||
var startIndex = query.StartIndex;
|
||||
var limit = query.Limit;
|
||||
|
@ -1272,7 +1272,7 @@ namespace MediaBrowser.Controller.Entities
|
|||
{
|
||||
ArgumentNullException.ThrowIfNull(user);
|
||||
|
||||
return GetChildren(user, includeLinkedChildren, null);
|
||||
return GetChildren(user, includeLinkedChildren, new InternalItemsQuery(user));
|
||||
}
|
||||
|
||||
public virtual List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
|
||||
|
|
Loading…
Reference in New Issue
Block a user