mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-03-27 04:22:08 +00:00
Fixed TopParent not beeing migrated
This commit is contained in:
@@ -144,9 +144,15 @@ namespace Emby.Server.Implementations.EntryPoints
|
||||
.Select(i =>
|
||||
{
|
||||
var dto = _userDataManager.GetUserDataDto(i, user);
|
||||
if (dto is null)
|
||||
{
|
||||
return null!;
|
||||
}
|
||||
|
||||
dto.ItemId = i.Id;
|
||||
return dto;
|
||||
})
|
||||
.Where(e => e is not null)
|
||||
.ToArray()
|
||||
};
|
||||
}
|
||||
|
||||
@@ -224,13 +224,18 @@ namespace Emby.Server.Implementations.Library
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public UserItemDataDto GetUserDataDto(BaseItem item, User user)
|
||||
public UserItemDataDto? GetUserDataDto(BaseItem item, User user)
|
||||
=> GetUserDataDto(item, null, user, new DtoOptions());
|
||||
|
||||
/// <inheritdoc />
|
||||
public UserItemDataDto GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options)
|
||||
public UserItemDataDto? GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options)
|
||||
{
|
||||
var userData = GetUserData(user, item) ?? throw new InvalidOperationException("Did not expect UserData to be null.");
|
||||
var userData = GetUserData(user, item);
|
||||
if (userData is null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var dto = GetUserItemDataDto(userData);
|
||||
|
||||
item.FillUserDataDtoValues(dto, userData, itemDto, user, options);
|
||||
|
||||
Reference in New Issue
Block a user