From 2ade0698c503f172d18840d35a8279f8a67e58a4 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 10 Nov 2023 23:03:01 +0800 Subject: [PATCH] remove unused code --- .../api/src/services/integrations/pocket.ts | 128 +----------------- .../api/src/services/integrations/readwise.ts | 27 ---- packages/api/src/services/library_item.ts | 4 +- packages/api/src/services/save_file.ts | 15 +- packages/api/src/services/save_page.ts | 1 + 5 files changed, 14 insertions(+), 161 deletions(-) diff --git a/packages/api/src/services/integrations/pocket.ts b/packages/api/src/services/integrations/pocket.ts index 86a99f8ef..1ea4d6d87 100644 --- a/packages/api/src/services/integrations/pocket.ts +++ b/packages/api/src/services/integrations/pocket.ts @@ -1,55 +1,7 @@ import axios from 'axios' -import { LibraryItemState } from '../../entity/library_item' import { env } from '../../env' import { logger } from '../../utils/logger' -import { - IntegrationClient, - RetrievedResult, - RetrieveRequest, -} from './integration' - -interface PocketResponse { - status: number // 1 if success - complete: number // 1 if all items have been returned - list: { - [key: string]: PocketItem - } - since: number // unix timestamp in seconds - search_meta: { - search_type: string - } - error: string -} - -interface PocketItem { - item_id: string - resolved_id: string - given_url: string - resolved_url: string - given_title: string - resolved_title: string - favorite: string - status: string - excerpt: string - word_count: string - tags?: { - [key: string]: Tag - } - authors?: { - [key: string]: Author - } -} - -interface Tag { - item_id: string - tag: string -} - -interface Author { - item_id: string - author_id: string - name: string -} +import { IntegrationClient } from './integration' export class PocketClient implements IntegrationClient { name = 'POCKET' @@ -83,82 +35,4 @@ export class PocketClient implements IntegrationClient { return null } } - - retrievePocketData = async ( - accessToken: string, - since: number, // unix timestamp in seconds - count = 100, - offset = 0 - ): Promise => { - const url = `${this.apiUrl}/get` - try { - const response = await axios.post( - url, - { - consumer_key: env.pocket.consumerKey, - access_token: accessToken, - state: 'all', - detailType: 'complete', - since, - sort: 'oldest', - count, - offset, - }, - { - headers: this.headers, - timeout: 10000, // 10 seconds - } - ) - - return response.data - } catch (error) { - if (axios.isAxiosError(error)) { - logger.error(error.response) - } else { - logger.error(error) - } - - return null - } - } - - retrieve = async ({ - token, - since = 0, - count = 100, - offset = 0, - }: RetrieveRequest): Promise => { - const pocketData = await this.retrievePocketData( - token, - since / 1000, - count, - offset - ) - if (!pocketData) { - throw new Error('Error retrieving pocket data') - } - - const pocketItems = Object.values(pocketData.list) - const statusToState: Record = { - '0': LibraryItemState.Succeeded, - '1': LibraryItemState.Archived, - '2': LibraryItemState.Deleted, - } - const data = pocketItems.map((item) => ({ - url: item.given_url, - labels: item.tags - ? Object.values(item.tags).map((tag) => tag.tag) - : undefined, - state: statusToState[item.status], - })) - - if (pocketData.error) { - throw new Error(`Error retrieving pocket data: ${pocketData.error}`) - } - - return { - data, - since: pocketData.since * 1000, - } - } } diff --git a/packages/api/src/services/integrations/readwise.ts b/packages/api/src/services/integrations/readwise.ts index 42f50f744..7764294d2 100644 --- a/packages/api/src/services/integrations/readwise.ts +++ b/packages/api/src/services/integrations/readwise.ts @@ -2,33 +2,6 @@ import axios from 'axios' import { logger } from '../../utils/logger' import { IntegrationClient } from './integration' -interface ReadwiseHighlight { - // The highlight text, (technically the only field required in a highlight object) - text: string - // The title of the page the highlight is on - title?: string - // The author of the page the highlight is on - author?: string - // The URL of the page image - image_url?: string - // The URL of the page - source_url?: string - // A meaningful unique identifier for your app - source_type?: string - // One of: books, articles, tweets or podcasts - category?: string - // Annotation note attached to the specific highlight - note?: string - // Highlight's location in the source text. Used to order the highlights - location?: number - // One of: page, order or time_offset - location_type?: string - // A datetime representing when the highlight was taken in the ISO 8601 format - highlighted_at?: string - // Unique url of the specific highlight - highlight_url?: string -} - export class ReadwiseClient implements IntegrationClient { name = 'READWISE' apiUrl = 'https://readwise.io/api/v2' diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 9eb4b6734..5cbfeb134 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -223,9 +223,7 @@ const buildWhereClause = ( } if (!args.includePending) { - queryBuilder.andWhere('library_item.state <> :state', { - state: LibraryItemState.Processing, - }) + queryBuilder.andWhere("library_item.state <> 'PROCESSING'") } if (!args.includeDeleted && args.inFilter !== InFilter.TRASH) { diff --git a/packages/api/src/services/save_file.ts b/packages/api/src/services/save_file.ts index f428cb77a..bffe06fb8 100644 --- a/packages/api/src/services/save_file.ts +++ b/packages/api/src/services/save_file.ts @@ -1,7 +1,12 @@ import { LibraryItemState } from '../entity/library_item' import { User } from '../entity/user' import { homePageURL } from '../env' -import { SaveErrorCode, SaveFileInput, SaveResult } from '../generated/graphql' +import { + ArticleSavingRequestStatus, + SaveErrorCode, + SaveFileInput, + SaveResult, +} from '../generated/graphql' import { getStorageFileDetails } from '../utils/uploads' import { findOrCreateLabels, saveLabelsInLibraryItem } from './labels' import { updateLibraryItem } from './library_item' @@ -32,9 +37,11 @@ export const saveFile = async ( await updateLibraryItem( input.clientRequestId, { - state: input.state - ? (input.state as unknown as LibraryItemState) - : LibraryItemState.Succeeded, + state: LibraryItemState.Succeeded, + folder: + input.state === ArticleSavingRequestStatus.Archived + ? 'archive' + : 'inbox', }, user.id ) diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts index 811b176a1..5ee1b2708 100644 --- a/packages/api/src/services/save_page.ts +++ b/packages/api/src/services/save_page.ts @@ -270,5 +270,6 @@ export const parsedContentToLibraryItem = ({ contentReader: contentReaderForLibraryItem(itemType, uploadFileId), subscription: rssFeedUrl, folder: state === ArticleSavingRequestStatus.Archived ? 'archive' : 'inbox', + state: LibraryItemState.Succeeded, } }