From e0b31a663a858a19358de89a49d121f7fcd29a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Wed, 15 Oct 2025 14:51:06 +0200 Subject: [PATCH] pl-api: fix masto quotes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-api/lib/entities/quote.ts | 4 ++-- packages/pl-api/lib/entities/status.ts | 8 ++++---- packages/pl-fe/src/actions/importer.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/pl-api/lib/entities/quote.ts b/packages/pl-api/lib/entities/quote.ts index c0888c65c..2465d724d 100644 --- a/packages/pl-api/lib/entities/quote.ts +++ b/packages/pl-api/lib/entities/quote.ts @@ -8,7 +8,7 @@ import { statusSchema } from './status'; */ const quoteSchema = v.object({ state: v.fallback(v.picklist(['pending', 'accepted', 'rejected', 'revoked', 'deleted', 'unauthorized']), 'accepted'), - status: v.fallback(v.nullable(v.lazy(() => statusSchema)), null), + quoted_status: v.fallback(v.nullable(v.lazy(() => statusSchema)), null), }); /** @@ -22,7 +22,7 @@ type Quote = v.InferOutput; */ const shallowQuoteSchema = v.object({ state: v.fallback(v.picklist(['pending', 'accepted', 'rejected', 'revoked', 'deleted', 'unauthorized']), 'accepted'), - status_id: v.fallback(v.nullable(v.string()), null), + quoted_status_id: v.fallback(v.nullable(v.string()), null), }); /** diff --git a/packages/pl-api/lib/entities/status.ts b/packages/pl-api/lib/entities/status.ts index 98c938840..870133702 100644 --- a/packages/pl-api/lib/entities/status.ts +++ b/packages/pl-api/lib/entities/status.ts @@ -114,10 +114,10 @@ const preprocess = (status: any) => { let quote: { state: string; - status: any; + quoted_status: any; } | { state: string; - status_id: string; + quoted_status_id: string; } | null = null; const quotedStatus = status.quote ?? status.pleroma?.quote; @@ -127,13 +127,13 @@ const preprocess = (status: any) => { } else if (quotedStatus) { quote = { state: 'accepted', - status: quotedStatus, + quoted_status: quotedStatus, }; } else { if (quotedStatusId) { quote = { state: 'accepted', - status_id: quotedStatusId, + quoted_status_id: quotedStatusId, }; } } diff --git a/packages/pl-fe/src/actions/importer.ts b/packages/pl-fe/src/actions/importer.ts index d6a22cd72..e6778c511 100644 --- a/packages/pl-fe/src/actions/importer.ts +++ b/packages/pl-fe/src/actions/importer.ts @@ -87,7 +87,7 @@ const importEntities = (entities: { processAccount(status.account); } - if (status.quote && 'status' in status.quote && status.quote.status) processStatus(status.quote.status); + if (status.quote && 'quoted_status' in status.quote && status.quote.quoted_status) processStatus(status.quote.quoted_status); if (status.reblog) processStatus(status.reblog); if (status.poll) polls[status.poll.id] = status.poll; if (status.group) groups[status.group.id] = status.group;