From fef5dbb6e2978833d2196c064678f56ea36758a7 Mon Sep 17 00:00:00 2001
From: Marie <marie@kaifa.ch>
Date: Tue, 13 Feb 2024 13:08:44 +0000
Subject: [PATCH 1/2] fix: note edits being federated incorrectly
---
.../src/core/activitypub/ApRendererService.ts | 23 ++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index e07bb8be78..f9376624db 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -700,17 +700,15 @@ export class ApRendererService {
poll = await this.pollsRepository.findOneBy({ noteId: note.id });
}
- let apText = text;
+ let apAppend = '';
if (quote) {
- apText += `\n\nRE: ${quote}`;
+ apAppend += `\n\nRE: ${quote}`;
}
const summary = note.cw === '' ? String.fromCharCode(0x200B) : note.cw;
- const content = this.apMfmService.getNoteHtml(Object.assign({}, note, {
- text: apText,
- }));
+ const { content, noMisskeyContent } = this.apMfmService.getNoteHtml(note, apAppend);
const emojis = await this.getEmojis(note.emojis);
const apemojis = emojis.filter(emoji => !emoji.localOnly).map(emoji => this.renderEmoji(emoji));
@@ -723,9 +721,6 @@ export class ApRendererService {
const asPoll = poll ? {
type: 'Question',
- content: this.apMfmService.getNoteHtml(Object.assign({}, note, {
- text: text,
- })),
[poll.expiresAt && poll.expiresAt < new Date() ? 'closed' : 'endTime']: poll.expiresAt,
[poll.multiple ? 'anyOf' : 'oneOf']: poll.choices.map((text, i) => ({
type: 'Note',
@@ -744,11 +739,13 @@ export class ApRendererService {
summary: summary ?? undefined,
content: content ?? undefined,
updated: note.updatedAt?.toISOString(),
- _misskey_content: text,
- source: {
- content: text,
- mediaType: 'text/x.misskeymarkdown',
- },
+ ...(noMisskeyContent ? {} : {
+ _misskey_content: text,
+ source: {
+ content: text,
+ mediaType: 'text/x.misskeymarkdown',
+ },
+ }),
_misskey_quote: quote,
quoteUrl: quote,
quoteUri: quote,
From 1015901a9dbc9fae6293869d4b58d6c488cd4f5a Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Tue, 13 Feb 2024 14:04:07 +0000
Subject: [PATCH 2/2] avoid parsing undefined
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
I don't understand why upstream wouldn't have this same problem ☹
We already have this same conditional in `ApRenderService.renderNote`
and `ApRenderService.renderUpNote`, and Misskey doesn't
---
packages/backend/src/core/activitypub/ApMfmService.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/backend/src/core/activitypub/ApMfmService.ts b/packages/backend/src/core/activitypub/ApMfmService.ts
index 0716e43123..88f0da281f 100644
--- a/packages/backend/src/core/activitypub/ApMfmService.ts
+++ b/packages/backend/src/core/activitypub/ApMfmService.ts
@@ -35,7 +35,7 @@ export class ApMfmService {
noMisskeyContent = true;
}
- const content = this.mfmService.toHtml(parsed, JSON.parse(note.mentionedRemoteUsers));
+ const content = this.mfmService.toHtml(parsed, note.mentionedRemoteUsers ? JSON.parse(note.mentionedRemoteUsers) : []);
return {
content,