Update typings

src/components/ExtensionCard.tsx

@@ -14,11 +14,11 @@ import Avatar from '@mui/material/Avatar';
 import Typography from '@mui/material/Typography';
 import { Box } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import { Extension, TranslationKey } from '@/typings';
+import { PartialExtension, TranslationKey } from '@/typings';
 import requestManager from '@/lib/requests/RequestManager.ts';
 
 interface IProps {
-    extension: Extension;
+    extension: PartialExtension;
 }
 
 enum ExtensionAction {

src/components/MangaCard.tsx

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import requestManager from '@/lib/requests/RequestManager.ts';
 import { GridLayout, useLibraryOptionsContext } from '@/components/context/LibraryOptionsContext';
 import SpinnerImage from '@/components/util/SpinnerImage';
-import { MangaType } from '@/lib/graphql/generated/graphql.ts';
+import { TPartialManga } from '@/typings.ts';
 
 const BottomGradient = styled('div')({
     position: 'absolute',
@@ -66,7 +66,7 @@ const BadgeContainer = styled('div')({
 });
 
 interface IProps {
-    manga: MangaType;
+    manga: TPartialManga;
     gridLayout?: GridLayout;
     inLibraryIndicator?: boolean;
 }
@@ -120,10 +120,10 @@ const MangaCard = (props: IProps) => {
                                         {t('manga.button.in_library')}
                                     </Typography>
                                 )}
-                                {showUnreadBadge && unread! > 0 && (
+                                {showUnreadBadge && (unread ?? 0) > 0 && (
                                     <Typography sx={{ backgroundColor: 'primary.dark' }}>{unread}</Typography>
                                 )}
-                                {showDownloadBadge && downloadCount! > 0 && (
+                                {showDownloadBadge && (downloadCount ?? 0) > 0 && (
                                     <Typography
                                         sx={{
                                             backgroundColor: 'success.dark',

src/components/MangaGrid.tsx

@@ -16,7 +16,7 @@ import LoadingPlaceholder from '@/components/util/LoadingPlaceholder';
 import MangaCard from '@/components/MangaCard';
 import { GridLayout } from '@/components/context/LibraryOptionsContext';
 import useLocalStorage from '@/util/useLocalStorage';
-import { MangaType } from '@/lib/graphql/generated/graphql.ts';
+import { TPartialManga } from '@/typings.ts';
 
 const GridContainer = React.forwardRef<HTMLDivElement, GridTypeMap['props']>(({ children, ...props }, ref) => (
     <Grid {...props} ref={ref} container sx={{ paddingLeft: '5px', paddingRight: '13px' }}>
@@ -40,13 +40,13 @@ const GridItemContainerWithDimension = (
     );
 };
 
-const createMangaCard = (manga: MangaType, gridLayout?: GridLayout, inLibraryIndicator?: boolean) => (
+const createMangaCard = (manga: TPartialManga, gridLayout?: GridLayout, inLibraryIndicator?: boolean) => (
     <MangaCard key={manga.id} manga={manga} gridLayout={gridLayout} inLibraryIndicator={inLibraryIndicator} />
 );
 
 type DefaultGridProps = {
     isLoading: boolean;
-    mangas: MangaType[];
+    mangas: TPartialManga[];
     inLibraryIndicator?: boolean;
     GridItemContainer: (props: GridTypeMap['props'] & Partial<GridItemProps>) => JSX.Element;
     gridLayout?: GridLayout;
@@ -150,7 +150,7 @@ const VerticalGrid = ({
 };
 
 export interface IMangaGridProps {
-    mangas: MangaType[];
+    mangas: TPartialManga[];
     isLoading: boolean;
     message?: string;
     messageExtra?: JSX.Element;

src/components/library/LibraryMangaGrid.tsx

@@ -9,13 +9,12 @@
 import React, { useEffect, useMemo } from 'react';
 import { StringParam, useQueryParam } from 'use-query-params';
 import { useTranslation } from 'react-i18next';
-import { LibrarySortMode, NullAndUndefined } from '@/typings';
+import { LibrarySortMode, NullAndUndefined, TManga } from '@/typings';
 import { useSearchSettings } from '@/util/searchSettings';
 import { useLibraryOptionsContext } from '@/components/context/LibraryOptionsContext';
 import MangaGrid from '@/components/MangaGrid';
-import { MangaType } from '@/lib/graphql/generated/graphql.ts';
 
-const unreadFilter = (unread: NullAndUndefined<boolean>, { unreadCount }: MangaType): boolean => {
+const unreadFilter = (unread: NullAndUndefined<boolean>, { unreadCount }: TManga): boolean => {
     switch (unread) {
         case true:
             return !!unreadCount && unreadCount >= 1;
@@ -26,7 +25,7 @@ const unreadFilter = (unread: NullAndUndefined<boolean>, { unreadCount }: MangaT
     }
 };
 
-const downloadedFilter = (downloaded: NullAndUndefined<boolean>, { downloadCount }: MangaType): boolean => {
+const downloadedFilter = (downloaded: NullAndUndefined<boolean>, { downloadCount }: TManga): boolean => {
     switch (downloaded) {
         case true:
             return !!downloadCount && downloadCount >= 1;
@@ -37,24 +36,24 @@ const downloadedFilter = (downloaded: NullAndUndefined<boolean>, { downloadCount
     }
 };
 
-const queryFilter = (query: NullAndUndefined<string>, { title }: MangaType): boolean => {
+const queryFilter = (query: NullAndUndefined<string>, { title }: TManga): boolean => {
     if (!query) return true;
     return title.toLowerCase().includes(query.toLowerCase());
 };
 
-const queryGenreFilter = (query: NullAndUndefined<string>, { genre }: MangaType): boolean => {
+const queryGenreFilter = (query: NullAndUndefined<string>, { genre }: TManga): boolean => {
     if (!query) return true;
     const queries = query.split(',').map((str) => str.toLowerCase().trim());
     return queries.every((element) => genre.map((el) => el.toLowerCase()).includes(element));
 };
 
 const filterManga = (
-    mangas: MangaType[],
+    mangas: TManga[],
     query: NullAndUndefined<string>,
     unread: NullAndUndefined<boolean>,
     downloaded: NullAndUndefined<boolean>,
     ignoreFilters: boolean,
-): MangaType[] =>
+): TManga[] =>
     mangas.filter((manga) => {
         const ignoreFiltersWhileSearching = ignoreFilters && query?.length;
         const matchesSearch = queryFilter(query, manga) || queryGenreFilter(query, manga);
@@ -64,20 +63,20 @@ const filterManga = (
         return matchesSearch && matchesFilters;
     });
 
-const sortByUnread = (a: MangaType, b: MangaType): number => (a.unreadCount ?? 0) - (b.unreadCount ?? 0);
+const sortByUnread = (a: TManga, b: TManga): number => (a.unreadCount ?? 0) - (b.unreadCount ?? 0);
 
-const sortByTitle = (a: MangaType, b: MangaType): number => a.title.localeCompare(b.title);
+const sortByTitle = (a: TManga, b: TManga): number => a.title.localeCompare(b.title);
 
-const sortByDateAdded = (a: MangaType, b: MangaType): number => Number(a.inLibraryAt) - Number(b.inLibraryAt);
+const sortByDateAdded = (a: TManga, b: TManga): number => Number(a.inLibraryAt) - Number(b.inLibraryAt);
 
-const sortByLastRead = (a: MangaType, b: MangaType): number =>
+const sortByLastRead = (a: TManga, b: TManga): number =>
     Number(b.lastReadChapter?.lastReadAt ?? 0) - Number(a.lastReadChapter?.lastReadAt ?? 0);
 
 const sortManga = (
-    manga: MangaType[],
+    manga: TManga[],
     sort: NullAndUndefined<LibrarySortMode>,
     desc: NullAndUndefined<boolean>,
-): MangaType[] => {
+): TManga[] => {
     const result = [...manga];
 
     switch (sort) {
@@ -105,7 +104,7 @@ const sortManga = (
 };
 
 interface LibraryMangaGridProps {
-    mangas: MangaType[];
+    mangas: TManga[];
     isLoading: boolean;
     message?: string;
 }

src/components/manga/ChapterCard.tsx

@@ -30,10 +30,11 @@ import { useTranslation } from 'react-i18next';
 import requestManager from '@/lib/requests/RequestManager.ts';
 import { getUploadDateString } from '@/util/date';
 import DownloadStateIndicator from '@/components/molecules/DownloadStateIndicator';
-import { ChapterType, DownloadType, UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts';
+import { DownloadType, UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts';
+import { TChapter } from '@/typings.ts';
 
 interface IProps {
-    chapter: ChapterType;
+    chapter: TChapter;
     chapterIds: number[];
     downloadChapter: DownloadType | undefined;
     showChapterNumber: boolean;

src/components/manga/ChapterList.tsx

@@ -11,7 +11,7 @@ import Typography from '@mui/material/Typography';
 import React, { ComponentProps, useEffect, useMemo, useRef, useState } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 import { useTranslation } from 'react-i18next';
-import { TranslationKey } from '@/typings';
+import { TChapter, TManga, TranslationKey } from '@/typings';
 import requestManager from '@/lib/requests/RequestManager.ts';
 import ChapterCard from '@/components/manga/ChapterCard';
 import ResumeFab from '@/components/manga/ResumeFAB';
@@ -21,7 +21,7 @@ import makeToast from '@/components/util/Toast';
 import ChaptersToolbarMenu from '@/components/manga/ChaptersToolbarMenu';
 import SelectionFAB from '@/components/manga/SelectionFAB';
 import { DEFAULT_FULL_FAB_HEIGHT } from '@/components/util/StyledFab';
-import { ChapterType, DownloadType, MangaType, UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts';
+import { DownloadType, UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts';
 
 const StyledVirtuoso = styled(Virtuoso)(({ theme }) => ({
     listStyle: 'none',
@@ -68,13 +68,13 @@ const actionsStrings: {
 };
 
 export interface IChapterWithMeta {
-    chapter: ChapterType;
+    chapter: TChapter;
     downloadChapter: DownloadType | undefined;
     selected: boolean | null;
 }
 
 interface IProps {
-    manga: MangaType;
+    manga: TManga;
     isRefreshing: boolean;
 }
 
@@ -88,10 +88,7 @@ const ChapterList: React.FC<IProps> = ({ manga, isRefreshing }) => {
 
     const [options, dispatch] = useChapterOptions(manga.id);
     const { data: chaptersData, loading: isLoading, refetch } = requestManager.useGetMangaChapters(manga.id);
-    const chapters = useMemo(
-        () => (chaptersData?.chapters.nodes as ChapterType[]) ?? [],
-        [chaptersData?.chapters.nodes],
-    );
+    const chapters = useMemo(() => chaptersData?.chapters.nodes ?? [], [chaptersData?.chapters.nodes]);
     const mangaChapterIds = useMemo(() => chapters.map((chapter) => chapter.id), [chapters]);
 
     useEffect(() => {

src/components/manga/MangaDetails.tsx

@@ -14,10 +14,9 @@ import React, { useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { t as translate } from 'i18next';
 import Button from '@mui/material/Button';
-import { ISource } from '@/typings';
+import { ISource, TManga } from '@/typings';
 import requestManager from '@/lib/requests/RequestManager.ts';
 import makeToast from '@/components/util/Toast';
-import { MangaType } from '@/lib/graphql/generated/graphql.ts';
 
 const DetailsWrapper = styled('div')(({ theme }) => ({
     width: '100%',
@@ -151,7 +150,7 @@ const OpenSourceButton = ({ url }: { url?: string | null }) => {
 };
 
 interface IProps {
-    manga: MangaType;
+    manga: TManga;
 }
 
 function getSourceName(source?: ISource | null) {

src/components/manga/MangaToolbarMenu.tsx

@@ -22,10 +22,10 @@ import {
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import CategorySelect from '@/components/navbar/action/CategorySelect';
-import { MangaType } from '@/lib/graphql/generated/graphql.ts';
+import { TManga } from '@/typings.ts';
 
 interface IProps {
-    manga: MangaType;
+    manga: TManga;
     onRefresh: () => any;
     refreshing: boolean;
 }

src/components/manga/util.tsx

@@ -12,10 +12,10 @@ import {
     ChapterOptionsReducerAction,
     ChapterSortMode,
     NullAndUndefined,
+    TChapter,
     TranslationKey,
 } from '@/typings';
 import { useReducerLocalStorage } from '@/util/useLocalStorage';
-import { ChapterType } from '@/lib/graphql/generated/graphql.ts';
 
 const defaultChapterOptions: ChapterListOptions = {
     active: false,
@@ -46,7 +46,7 @@ function chapterOptionsReducer(state: ChapterListOptions, actions: ChapterOption
     }
 }
 
-export function unreadFilter(unread: NullAndUndefined<boolean>, { isRead: isChapterRead }: ChapterType) {
+export function unreadFilter(unread: NullAndUndefined<boolean>, { isRead: isChapterRead }: TChapter) {
     switch (unread) {
         case true:
             return !isChapterRead;
@@ -57,7 +57,7 @@ export function unreadFilter(unread: NullAndUndefined<boolean>, { isRead: isChap
     }
 }
 
-function downloadFilter(downloaded: NullAndUndefined<boolean>, { isDownloaded: chapterDownload }: ChapterType) {
+function downloadFilter(downloaded: NullAndUndefined<boolean>, { isDownloaded: chapterDownload }: TChapter) {
     switch (downloaded) {
         case true:
             return chapterDownload;
@@ -68,7 +68,7 @@ function downloadFilter(downloaded: NullAndUndefined<boolean>, { isDownloaded: c
     }
 }
 
-function bookmarkedFilter(bookmarked: NullAndUndefined<boolean>, { isBookmarked: chapterBookmarked }: ChapterType) {
+function bookmarkedFilter(bookmarked: NullAndUndefined<boolean>, { isBookmarked: chapterBookmarked }: TChapter) {
     switch (bookmarked) {
         case true:
             return chapterBookmarked;
@@ -79,7 +79,7 @@ function bookmarkedFilter(bookmarked: NullAndUndefined<boolean>, { isBookmarked:
     }
 }
 
-export function filterAndSortChapters(chapters: ChapterType[], options: ChapterListOptions): ChapterType[] {
+export function filterAndSortChapters(chapters: TChapter[], options: ChapterListOptions): TChapter[] {
     const filtered = options.active
         ? chapters.filter(
               (chp) =>

src/components/navbar/ReaderNavBar.tsx

@@ -24,9 +24,8 @@ import ListItemText from '@mui/material/ListItemText';
 import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
 import Collapse from '@mui/material/Collapse';
 import { useTranslation } from 'react-i18next';
-import { ChapterOffset, IReaderSettings } from '@/typings';
+import { ChapterOffset, IReaderSettings, TChapter, TManga } from '@/typings';
 import ReaderSettingsOptions from '@/components/reader/ReaderSettingsOptions';
-import { ChapterType, MangaType } from '@/lib/graphql/generated/graphql.ts';
 
 const Root = styled('div')(({ theme }) => ({
     top: 0,
@@ -115,8 +114,8 @@ const OpenDrawerButton = styled(IconButton)(({ theme }) => ({
 interface IProps {
     settings: IReaderSettings;
     setSettingValue: (key: keyof IReaderSettings, value: string | boolean) => void;
-    manga: MangaType;
-    chapter: ChapterType;
+    manga: TManga;
+    chapter: TChapter;
     curPage: number;
     scrollToPage: (page: number) => void;
     openNextChapter: (offset: ChapterOffset, setHistory: (nextChapterIndex: number) => void) => Promise<void>;

src/components/source/SourceMangaGrid.tsx

@@ -8,9 +8,9 @@
 
 import { useTranslation } from 'react-i18next';
 import MangaGrid, { IMangaGridProps } from '@/components/MangaGrid';
-import { MangaType } from '@/lib/graphql/generated/graphql.ts';
+import { TPartialManga } from '@/typings.ts';
 
-function filterManga(mangas: MangaType[]): MangaType[] {
+function filterManga(mangas: TPartialManga[]): TPartialManga[] {
     return mangas;
 }