From 3d986a90363bcba029512ec32c23f23794ea1bff Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 20 Mar 2024 22:33:24 +0800 Subject: [PATCH 1/2] send labels and highlight annotations in page_create event --- packages/api/src/jobs/rss/refreshFeed.ts | 1 + packages/api/src/services/library_item.ts | 8 ++++---- packages/api/src/services/save_page.ts | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/api/src/jobs/rss/refreshFeed.ts b/packages/api/src/jobs/rss/refreshFeed.ts index a97030ab1..76078a8f4 100644 --- a/packages/api/src/jobs/rss/refreshFeed.ts +++ b/packages/api/src/jobs/rss/refreshFeed.ts @@ -361,6 +361,7 @@ const createItemWithFeedContent = async ( clientRequestId: '', author: item.creator, previewImage, + labels: [{ name: 'RSS' }], }, user ) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 8cc80bd6a..ce33fd834 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -1244,7 +1244,7 @@ export const deleteLibraryItemsByAdmin = async ( } export const batchDelete = async (criteria: FindOptionsWhere) => { - const batchSize = 1000 + const batchSize = 100 const qb = libraryItemRepository.createQueryBuilder().where(criteria) const countSql = queryBuilderToRawSql(qb.select('COUNT(1)')) @@ -1411,15 +1411,15 @@ export const filterItemEvents = ( return event.itemType?.toString().toLowerCase() === lowercasedValue } case 'label': { - const labels = event.labelNames as string[] + const labels = event.labelNames as string[] | undefined const labelsToTest = lowercasedValue.split(',') return labelsToTest.some((label) => { const hasWildcard = label.includes('*') if (hasWildcard) { - return labels.some((l) => l.match(new RegExp(label, 'i'))) + return labels?.some((l) => l.match(new RegExp(label, 'i'))) } - return labels.some((l) => l.toLowerCase() === label) + return labels?.some((l) => l.toLowerCase() === label) }) } case 'has': diff --git a/packages/api/src/services/save_page.ts b/packages/api/src/services/save_page.ts index e54b3d026..702924b91 100644 --- a/packages/api/src/services/save_page.ts +++ b/packages/api/src/services/save_page.ts @@ -135,6 +135,7 @@ export const savePage = async ( dir: parseResult.parsedContent?.dir, preparedDocument, labelNames: input.labels?.map((label) => label.name), + highlightAnnotations: parseResult.highlightData ? [''] : undefined, }) const isImported = input.source === 'csv-importer' || input.source === 'pocket' @@ -215,6 +216,7 @@ export const parsedContentToLibraryItem = ({ feedContent, dir, labelNames, + highlightAnnotations, }: { url: string userId: string @@ -237,6 +239,7 @@ export const parsedContentToLibraryItem = ({ feedContent?: string | null dir?: string | null labelNames?: string[] + highlightAnnotations?: string[] }): DeepPartial & { originalUrl: string } => { logger.info('save_page', { url, state, itemId }) return { @@ -285,5 +288,6 @@ export const parsedContentToLibraryItem = ({ ? DirectionalityType.RTL : DirectionalityType.LTR, // default to LTR labelNames, + highlightAnnotations, } } From 6385b40e3874127748856b5b6201c27df58967df Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Wed, 20 Mar 2024 23:07:46 +0800 Subject: [PATCH 2/2] revert batch size change --- packages/api/src/services/library_item.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index ce33fd834..6591975e4 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -1244,7 +1244,7 @@ export const deleteLibraryItemsByAdmin = async ( } export const batchDelete = async (criteria: FindOptionsWhere) => { - const batchSize = 100 + const batchSize = 1000 const qb = libraryItemRepository.createQueryBuilder().where(criteria) const countSql = queryBuilderToRawSql(qb.select('COUNT(1)'))