Create correct manga thumbnail url (#601)

Regression introduced with c099e01
Suwayomi · Feb 16, 2024 · aea112e · aea112e
1 parent 4b54b09
commit aea112e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/components/MangaCard.tsx b/src/components/MangaCard.tsx
@@ -14,7 +14,6 @@ import { Avatar, Box, CardContent, Stack, styled, Tooltip } from '@mui/material'
 import { useTranslation } from 'react-i18next';
 import PopupState, { bindMenu } from 'material-ui-popup-state';
 import { useState } from 'react';
-import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { GridLayout, useLibraryOptionsContext } from '@/components/context/LibraryOptionsContext';
 import { SpinnerImage } from '@/components/util/SpinnerImage';
 import { TManga, TPartialManga } from '@/typings.ts';
@@ -214,7 +213,7 @@ export const MangaCard = (props: MangaCardProps) => {
                                             </Stack>
                                             <SpinnerImage
                                                 alt={title}
-                                                src={requestManager.getValidImgUrlFor(thumbnailUrl)}
+                                                src={thumbnailUrl}
                                                 imgStyle={
                                                     inLibraryIndicator && inLibrary
                                                         ? {
@@ -366,7 +365,7 @@ export const MangaCard = (props: MangaCardProps) => {
                                                       imageRendering: 'pixelated',
                                                   }
                                         }
-                                        src={requestManager.getValidImgUrlFor(thumbnailUrl)}
+                                        src={thumbnailUrl}
                                     />
                                     <Box
                                         sx={{

diff --git a/src/components/manga/MangaDetails.tsx b/src/components/manga/MangaDetails.tsx
@@ -20,6 +20,7 @@ import { makeToast } from '@/components/util/Toast';
 import { useMetadataServerSettings } from '@/util/metadataServerSettings.ts';
 import { CategorySelect } from '@/components/navbar/action/CategorySelect.tsx';
 import { Mangas } from '@/lib/data/Mangas.ts';
+import { SpinnerImage } from '@/components/util/SpinnerImage.tsx';
 
 const DetailsWrapper = styled('div')(({ theme }) => ({
     width: '100%',
@@ -216,7 +217,7 @@ export const MangaDetails: React.FC<IProps> = ({ manga }) => {
                 <TopContentWrapper>
                     <ThumbnailMetadataWrapper>
                         <Thumbnail>
-                            {manga.thumbnailUrl && <img src={Mangas.getThumbnailUrl(manga)} alt="Manga Thumbnail" />}
+                            <SpinnerImage src={Mangas.getThumbnailUrl(manga)} alt="Manga Thumbnail" />
                         </Thumbnail>
                         <Metadata>
                             <h1>{manga.title}</h1>

diff --git a/src/lib/data/Mangas.ts b/src/lib/data/Mangas.ts
@@ -174,7 +174,10 @@ export class Mangas {
     }
 
     static getThumbnailUrl(manga: MangaLastFetchedInfo & Partial<MangaThumbnailInfo>): string {
-        return manga.thumbnailUrl ? `${manga.thumbnailUrl}?fetchedAt=${manga.lastFetchedAt}` : 'nonExistingMangaUrl';
+        const thumbnailUrl = manga.thumbnailUrl
+            ? `${manga.thumbnailUrl}?fetchedAt=${manga.lastFetchedAt}`
+            : 'nonExistingMangaUrl';
+        return requestManager.getValidImgUrlFor(thumbnailUrl);
     }
 
     static async getChapterIdsWithState(

diff --git a/src/lib/graphql/Fragments.ts b/src/lib/graphql/Fragments.ts
@@ -273,6 +273,7 @@ export const FULL_CHAPTER_FIELDS = gql`
             title
             inLibrary
             thumbnailUrl
+            lastFetchedAt
         }
         meta {
             key
-Original file line number
+Diff line change
@@ Expand Up / @@ -273,6 +273,7 @@ export const FULL_CHAPTER_FIELDS = gql` @@
                 title
                 inLibrary
                 thumbnailUrl
+                lastFetchedAt
             }
             meta {
                 key
@@ Expand Down @@