merge: follow-up on !710: send MFM payload for notes that don't contain advanced MFM (!713)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/713

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
dakkar 2024-10-24 17:32:00 +00:00
commit beff26e6f4

View File

@ -711,7 +711,7 @@ export class ApRendererService {
const summary = note.cw === '' ? String.fromCharCode(0x200B) : note.cw; const summary = note.cw === '' ? String.fromCharCode(0x200B) : note.cw;
const { content, noMisskeyContent } = this.apMfmService.getNoteHtml(note, apAppend); const { content } = this.apMfmService.getNoteHtml(note, apAppend);
const emojis = await this.getEmojis(note.emojis); const emojis = await this.getEmojis(note.emojis);
const apemojis = emojis.filter(emoji => !emoji.localOnly).map(emoji => this.renderEmoji(emoji)); const apemojis = emojis.filter(emoji => !emoji.localOnly).map(emoji => this.renderEmoji(emoji));
@ -742,13 +742,11 @@ export class ApRendererService {
summary: summary ?? undefined, summary: summary ?? undefined,
content: content ?? undefined, content: content ?? undefined,
updated: note.updatedAt?.toISOString(), updated: note.updatedAt?.toISOString(),
...(noMisskeyContent ? {} : {
_misskey_content: text, _misskey_content: text,
source: { source: {
content: text, content: text,
mediaType: 'text/x.misskeymarkdown', mediaType: 'text/x.misskeymarkdown',
}, },
}),
_misskey_quote: quote, _misskey_quote: quote,
quoteUrl: quote, quoteUrl: quote,
quoteUri: quote, quoteUri: quote,