From 25948c9232156e553374ccaa8917c004e1f35fdd Mon Sep 17 00:00:00 2001 From: dakkar Date: Sat, 3 Feb 2024 11:29:46 +0000 Subject: [PATCH] simpler json-isation thanks Alina for the suggestion --- .../src/queue/processors/ImportNotesProcessorService.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts index e5177d28e5..0554566748 100644 --- a/packages/backend/src/queue/processors/ImportNotesProcessorService.ts +++ b/packages/backend/src/queue/processors/ImportNotesProcessorService.ts @@ -130,11 +130,11 @@ export class ImportNotesProcessorService { return typeof obj[Symbol.iterator] === 'function'; } - private parseTwitterFile(str : string) : null | [{ tweet: any }] { - const removed = str.replace(new RegExp('window\\.YTD\\.tweets\\.part0 = ', 'g'), ''); - + private parseTwitterFile(str : string) : null | { tweet: object }[] { + const jsonStr = str.replace(/^\s*window\.YTD\.tweets\.part0\s*=\s*/, ''); + try { - return JSON.parse(removed); + return JSON.parse(jsonStr); } catch (error) { //The format is not what we expected. Either this file was tampered with or twitters exports changed return null;