diff --git a/src/lib/requests/RequestManager.ts b/src/lib/requests/RequestManager.ts index ab567551..c808cc2a 100644 --- a/src/lib/requests/RequestManager.ts +++ b/src/lib/requests/RequestManager.ts @@ -355,7 +355,7 @@ export class RequestManager { maxPage: number, signal: AbortSignal, ): Promise { - const { response: revalidationRequest } = this.doRequestNew( + const { response: revalidationRequest } = this.doRequest( GQLMethod.MUTATION, GET_SOURCE_MANGAS_FETCH, getVariablesFor(pageToRevalidate), @@ -497,7 +497,7 @@ export class RequestManager { await revalidate(newPage, abortRequest, signal); } - const { response: request } = this.doRequestNew( + const { response: request } = this.doRequest( GQLMethod.MUTATION, documentNode, getVariablesFor(newPage), @@ -648,42 +648,42 @@ export class RequestManager { return `${this.getValidUrlFor(imageUrl, apiVersion)}${useCacheQuery}`; } - private doRequestNew( + private doRequest( method: GQLMethod.QUERY, operation: DocumentNode | TypedDocumentNode, variables: Variables | undefined, options?: QueryOptions, ): AbortabaleApolloQueryResponse; - private doRequestNew( + private doRequest( method: GQLMethod.USE_QUERY, operation: DocumentNode | TypedDocumentNode, variables: Variables | undefined, options?: QueryHookOptions, ): AbortableApolloUseQueryResponse; - private doRequestNew( + private doRequest( method: GQLMethod.USE_MUTATION, operation: DocumentNode | TypedDocumentNode, variables: Variables | undefined, options?: MutationHookOptions, ): AbortableApolloUseMutationResponse; - private doRequestNew( + private doRequest( method: GQLMethod.MUTATION, operation: DocumentNode | TypedDocumentNode, variables: Variables | undefined, options?: MutationOptions, ): AbortableApolloMutationResponse; - private doRequestNew( + private doRequest( method: GQLMethod.USE_SUBSCRIPTION, operation: DocumentNode | TypedDocumentNode, variables: Variables | undefined, options?: SubscriptionHookOptions, ): SubscriptionResult; - private doRequestNew( + private doRequest( method: GQLMethod, operation: DocumentNode | TypedDocumentNode, variables: Variables | undefined, @@ -779,7 +779,7 @@ export class RequestManager { public useGetGlobalMeta( options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_GLOBAL_METADATAS, {}, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_GLOBAL_METADATAS, {}, options); } public setGlobalMetadata( @@ -787,7 +787,7 @@ export class RequestManager { value: any, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, SET_GLOBAL_METADATA, { input: { meta: { key, value: `${value}` } } }, @@ -798,32 +798,32 @@ export class RequestManager { public useGetAbout( options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_ABOUT, {}, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_ABOUT, {}, options); } public useCheckForUpdate( options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, CHECK_FOR_SERVER_UPDATES, {}, options); + return this.doRequest(GQLMethod.USE_QUERY, CHECK_FOR_SERVER_UPDATES, {}, options); } public useGetExtensionList( options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_EXTENSIONS, {}, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_EXTENSIONS, {}, options); } public useExtensionListFetch( options?: MutationHookOptions, ): AbortableApolloUseMutationResponse { - return this.doRequestNew(GQLMethod.USE_MUTATION, GET_EXTENSIONS_FETCH, {}, options); + return this.doRequest(GQLMethod.USE_MUTATION, GET_EXTENSIONS_FETCH, {}, options); } public installExternalExtension( extensionFile: File, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, INSTALL_EXTERNAL_EXTENSION, { file: extensionFile }, @@ -836,7 +836,7 @@ export class RequestManager { patch: UpdateExtensionPatchInput, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_EXTENSION, { input: { id, patch } }, @@ -851,14 +851,14 @@ export class RequestManager { public useGetSourceList( options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_SOURCES, {}, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_SOURCES, {}, options); } public useGetSource( id: string, options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_SOURCE, { id }, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_SOURCE, { id }, options); } public useGetSourceMangas( @@ -1073,7 +1073,7 @@ export class RequestManager { change: SourcePreferenceChangeInput, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_SOURCE_PREFERENCES, { input: { source, change } }, @@ -1105,14 +1105,14 @@ export class RequestManager { mangaId: number | string, options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_MANGA, { id: Number(mangaId) }, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_MANGA, { id: Number(mangaId) }, options); } public getMangaFetch( mangaId: number | string, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, GET_MANGA_FETCH, { @@ -1134,7 +1134,7 @@ export class RequestManager { public useUpdateMangaCategories( options?: MutationHookOptions, ): AbortableApolloUseMutationResponse { - return this.doRequestNew(GQLMethod.USE_MUTATION, UPDATE_MANGA_CATEGORIES, undefined, { + return this.doRequest(GQLMethod.USE_MUTATION, UPDATE_MANGA_CATEGORIES, undefined, { refetchQueries: [GET_MANGA, GET_MANGAS, GET_CATEGORY, GET_CATEGORIES, GET_CATEGORY_MANGAS], ...options, }); @@ -1145,7 +1145,7 @@ export class RequestManager { patch: UpdateMangaPatchInput, options?: MutationHookOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_MANGA, { input: { id, patch } }, @@ -1169,7 +1169,7 @@ export class RequestManager { value: any, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, SET_MANGA_METADATA, { @@ -1183,7 +1183,7 @@ export class RequestManager { variables: GetChaptersQueryVariables, options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_CHAPTERS, variables, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_CHAPTERS, variables, options); } public useGetMangaChapters( @@ -1204,7 +1204,7 @@ export class RequestManager { mangaId: number | string, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, GET_MANGA_CHAPTERS_FETCH, { input: { mangaId: Number(mangaId) } }, @@ -1253,7 +1253,7 @@ export class RequestManager { chapter: GetChaptersQuery['chapters']['nodes'][number]; }; - const chapterRequest = this.doRequestNew( + const chapterRequest = this.doRequest( GQLMethod.QUERY, GET_CHAPTERS, { @@ -1283,7 +1283,7 @@ export class RequestManager { chapterId: string | number, options?: MutationHookOptions, ): AbortableApolloUseMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.USE_MUTATION, GET_CHAPTER_PAGES_FETCH, { @@ -1297,7 +1297,7 @@ export class RequestManager { id: number, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, DELETE_DOWNLOADED_CHAPTER, { input: { id } }, @@ -1309,7 +1309,7 @@ export class RequestManager { ids: number[], options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, DELETE_DOWNLOADED_CHAPTERS, { input: { ids } }, @@ -1322,7 +1322,7 @@ export class RequestManager { patch: UpdateChapterPatchInput, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_CHAPTER, { input: { id, patch } }, @@ -1336,7 +1336,7 @@ export class RequestManager { value: any, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, SET_CHAPTER_METADATA, { input: { meta: { chapterId, key, value: `${value}` } } }, @@ -1356,7 +1356,7 @@ export class RequestManager { patch: UpdateChapterPatchInput, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_CHAPTERS, { input: { ids, patch } }, @@ -1367,7 +1367,7 @@ export class RequestManager { public useGetCategories( options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.USE_QUERY, GET_CATEGORIES, { @@ -1381,7 +1381,7 @@ export class RequestManager { input: CreateCategoryInput, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, CREATE_CATEGORY, { input }, @@ -1394,7 +1394,7 @@ export class RequestManager { position: number, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_CATEGORY_ORDER, { input: { id, position } }, @@ -1406,14 +1406,14 @@ export class RequestManager { id: number, options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_CATEGORY_MANGAS, { id }, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_CATEGORY_MANGAS, { id }, options); } public deleteCategory( categoryId: number, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, DELETE_CATEGORY, { input: { categoryId } }, @@ -1426,7 +1426,7 @@ export class RequestManager { patch: UpdateCategoryPatchInput, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_CATEGORY, { input: { id, patch } }, @@ -1440,7 +1440,7 @@ export class RequestManager { value: any, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, SET_CATEGORY_METADATA, { input: { meta: { categoryId, key, value: `${value}` } } }, @@ -1452,7 +1452,7 @@ export class RequestManager { file: File, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, RESTORE_BACKUP, { input: { backup: file } }, @@ -1464,7 +1464,7 @@ export class RequestManager { file: File, options?: QueryOptions, ): AbortabaleApolloQueryResponse { - return this.doRequestNew(GQLMethod.QUERY, VALIDATE_BACKUP, { input: { backup: file } }, options); + return this.doRequest(GQLMethod.QUERY, VALIDATE_BACKUP, { input: { backup: file } }, options); } public getExportBackupUrl(): string { @@ -1474,7 +1474,7 @@ export class RequestManager { public startDownloads( options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, START_DOWNLOADER, {}, @@ -1485,7 +1485,7 @@ export class RequestManager { public stopDownloads( options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, STOP_DOWNLOADER, {}, @@ -1496,7 +1496,7 @@ export class RequestManager { public clearDownloads( options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, CLEAR_DOWNLOADER, {}, @@ -1508,7 +1508,7 @@ export class RequestManager { id: number, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, ENQUEUE_CHAPTER_DOWNLOAD, { input: { id } }, @@ -1520,7 +1520,7 @@ export class RequestManager { id: number, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, DEQUEUE_CHAPTER_DOWNLOAD, { input: { id } }, @@ -1533,7 +1533,7 @@ export class RequestManager { position: number, options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, REORDER_CHAPTER_DOWNLOAD, { input: { chapterId, to: position } }, @@ -1545,7 +1545,7 @@ export class RequestManager { ids: number[], options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, ENQUEUE_CHAPTER_DOWNLOADS, { input: { ids } }, @@ -1557,7 +1557,7 @@ export class RequestManager { ids: number[], options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, DEQUEUE_CHAPTER_DOWNLOADS, { input: { ids } }, @@ -1613,7 +1613,7 @@ export class RequestManager { Variables extends UpdateLibraryMangasMutationVariables | UpdateCategoryMangasMutationVariables, >(categories?: number[], options?: MutationOptions): AbortableApolloMutationResponse { if (categories?.length) { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_CATEGORY_MANGAS, { input: { categories } }, @@ -1621,7 +1621,7 @@ export class RequestManager { ) as AbortableApolloMutationResponse; } - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, UPDATE_LIBRARY_MANGAS, {}, @@ -1632,7 +1632,7 @@ export class RequestManager { public resetGlobalUpdate( options?: MutationOptions, ): AbortableApolloMutationResponse { - return this.doRequestNew( + return this.doRequest( GQLMethod.MUTATION, STOP_UPDATER, {}, @@ -1643,19 +1643,19 @@ export class RequestManager { public useGetGlobalUpdateSummary( options?: QueryHookOptions, ): AbortableApolloUseQueryResponse { - return this.doRequestNew(GQLMethod.USE_QUERY, GET_UPDATE_STATUS, {}, options); + return this.doRequest(GQLMethod.USE_QUERY, GET_UPDATE_STATUS, {}, options); } public useDownloadSubscription( options?: SubscriptionHookOptions, ): SubscriptionResult { - return this.doRequestNew(GQLMethod.USE_SUBSCRIPTION, DOWNLOAD_STATUS_SUBSCRIPTION, {}, options); + return this.doRequest(GQLMethod.USE_SUBSCRIPTION, DOWNLOAD_STATUS_SUBSCRIPTION, {}, options); } public useUpdaterSubscription( options?: SubscriptionHookOptions, ): SubscriptionResult { - return this.doRequestNew(GQLMethod.USE_SUBSCRIPTION, UPDATER_SUBSCRIPTION, {}, options); + return this.doRequest(GQLMethod.USE_SUBSCRIPTION, UPDATER_SUBSCRIPTION, {}, options); } }