From 00de25eccf572ee540adcfff0c6060c7131c0e3c Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero@yahoo.com>
Date: Sun, 23 Jun 2024 00:55:23 +0300
Subject: [PATCH] Fix Parent Thumb Image for NextUp And Resume

---
 .../cardbuilder/Card/useCardImageUrl.ts          | 16 ++++++++--------
 src/hooks/useFetchItems.ts                       | 10 +++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/cardbuilder/Card/useCardImageUrl.ts b/src/components/cardbuilder/Card/useCardImageUrl.ts
index 4675c1d80b..fe1a91ae7f 100644
--- a/src/components/cardbuilder/Card/useCardImageUrl.ts
+++ b/src/components/cardbuilder/Card/useCardImageUrl.ts
@@ -38,12 +38,12 @@ function getPreferThumbInfo(item: ItemDto, cardOptions: CardOptions) {
     } else if (
         item.ParentBackdropImageTags?.length
         && cardOptions.inheritThumb !== false
-        && item.Type === BaseItemKind.Episode
     ) {
         imgType = ImageType.Backdrop;
         imgTag = item.ParentBackdropImageTags[0];
         itemId = item.ParentBackdropItemId;
     }
+
     return {
         itemId: itemId,
         imgTag: imgTag,
@@ -139,11 +139,11 @@ function shouldShowParentThumbImageTag(
     cardOptions: CardOptions
 ): boolean {
     return (
-        Boolean(itemParentThumbItemId) && cardOptions.inheritThumb !== false
+        Boolean(itemParentThumbItemId) && Boolean(cardOptions.inheritThumb)
     );
 }
 
-function shouldShowParentBackdropImageTags(item: ItemDto): boolean {
+function shouldShowAlbumPrimaryImageTag(item: ItemDto): boolean {
     return Boolean(item.AlbumId) && Boolean(item.AlbumPrimaryImageTag);
 }
 
@@ -185,6 +185,10 @@ function getCardImageInfo(
         imgType = preferLogoInfo.imgType;
         imgTag = preferLogoInfo.imgType;
         itemId = preferLogoInfo.itemId;
+    } else if (shouldShowParentThumbImageTag(item.ParentThumbItemId, cardOptions)) {
+        imgType = ImageType.Thumb;
+        imgTag = item.ParentThumbImageTag;
+        itemId = item.ParentThumbItemId;
     } else if (shouldShowImageTagsPrimary(item)) {
         imgType = ImageType.Primary;
         imgTag = item.ImageTags?.Primary;
@@ -207,7 +211,7 @@ function getCardImageInfo(
         imgType = ImageType.Primary;
         imgTag = item.ParentPrimaryImageTag;
         itemId = item.ParentPrimaryImageItemId;
-    } else if (shouldShowParentBackdropImageTags(item)) {
+    } else if (shouldShowAlbumPrimaryImageTag(item)) {
         imgType = ImageType.Primary;
         imgTag = item.AlbumPrimaryImageTag;
         itemId = item.AlbumId;
@@ -226,10 +230,6 @@ function getCardImageInfo(
         imgType = ImageType.Thumb;
         imgTag = item.SeriesThumbImageTag;
         itemId = item.SeriesId;
-    } else if (shouldShowParentThumbImageTag(item.ParentThumbItemId, cardOptions)) {
-        imgType = ImageType.Thumb;
-        imgTag = item.ParentThumbImageTag;
-        itemId = item.ParentThumbItemId;
     } else if (
         item.ParentBackdropImageTags?.length
         && cardOptions.inheritThumb !== false
diff --git a/src/hooks/useFetchItems.ts b/src/hooks/useFetchItems.ts
index 86f531194e..34ea3fca02 100644
--- a/src/hooks/useFetchItems.ts
+++ b/src/hooks/useFetchItems.ts
@@ -758,8 +758,8 @@ const fetchGetSectionItems = async (
                             imageTypeLimit: 1,
                             enableImageTypes: [
                                 ImageType.Primary,
-                                ImageType.Backdrop,
-                                ImageType.Thumb
+                                ImageType.Thumb,
+                                ImageType.Backdrop
                             ],
                             enableTotalRecordCount: false,
                             ...section.parametersOptions
@@ -782,7 +782,11 @@ const fetchGetSectionItems = async (
                                 ItemFields.MediaSourceCount
                             ],
                             imageTypeLimit: 1,
-                            enableImageTypes: [ImageType.Thumb],
+                            enableImageTypes: [
+                                ImageType.Primary,
+                                ImageType.Thumb,
+                                ImageType.Backdrop
+                            ],
                             enableTotalRecordCount: false,
                             ...section.parametersOptions
                         },