From 734c6685f752531132f91a4f9de33ddd61a4f531 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Sat, 4 Nov 2023 23:41:58 +0100 Subject: [PATCH] [mastodon-client] Don't duplicate RE: for pleroma/akkoma quotes --- .../src/server/api/mastodon/converters/note.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/server/api/mastodon/converters/note.ts b/packages/backend/src/server/api/mastodon/converters/note.ts index 813192d66..fbff5ef9c 100644 --- a/packages/backend/src/server/api/mastodon/converters/note.ts +++ b/packages/backend/src/server/api/mastodon/converters/note.ts @@ -93,10 +93,12 @@ export class NoteConverter { return renote.url ?? renote.uri ?? `${config.url}/notes/${renote.id}`; }); - const content = note.text !== null - ? quoteUri.then(quoteUri => MfmHelpers.toHtml(mfm.parse(note.text!), JSON.parse(note.mentionedRemoteUsers), note.userHost, false, quoteUri) - .then(p => p ?? escapeMFM(note.text!))) - : ""; + const text = quoteUri.then(quoteUri => note.text !== null ? quoteUri !== null ? note.text.replaceAll(`RE: ${quoteUri}`, '').replaceAll(quoteUri, '').trimEnd() : note.text : null) + + const content = text.then(text => text !== null + ? quoteUri.then(quoteUri => MfmHelpers.toHtml(mfm.parse(text), JSON.parse(note.mentionedRemoteUsers), note.userHost, false, quoteUri)) + .then(p => p ?? escapeMFM(text)) + : ""); const isPinned = user && note.userId === user.id ? UserNotePinings.exist({ where: { userId: user.id, noteId: note.id } }) @@ -122,7 +124,7 @@ export class NoteConverter { reblog: reblog.then(reblog => !isQuote(note) ? reblog : null), content: content, content_type: 'text/x.misskeymarkdown', - text: note.text, + text: text, created_at: note.createdAt.toISOString(), emojis: noteEmoji, replies_count: note.repliesCount,