From 1d36ab6ddb673cdce46da01eb8c87725d41755a0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 30 Dec 2024 15:39:21 -0500 Subject: [PATCH] fix: #12996, invalid title generation when remote post content has markdown source --- src/activitypub/notes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/activitypub/notes.js b/src/activitypub/notes.js index 528d9832d3..03cca7d9d8 100644 --- a/src/activitypub/notes.js +++ b/src/activitypub/notes.js @@ -74,7 +74,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => { // chain = chain.sort((a, b) => a.timestamp - b.timestamp); const mainPost = chain[0]; - let { pid: mainPid, tid, uid: authorId, timestamp, name, content, _activitypub } = mainPost; + let { pid: mainPid, tid, uid: authorId, timestamp, name, content, sourceContent, _activitypub } = mainPost; const hasTid = !!tid; const cid = hasTid ? await topics.getTopicField(tid, 'cid') : options.cid || -1; @@ -109,7 +109,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => { } // mainPid ok to leave as-is - title = name || activitypub.helpers.generateTitle(utils.decodeHTMLEntities(content)); + title = name || activitypub.helpers.generateTitle(utils.decodeHTMLEntities(content || sourceContent)); // Remove any custom emoji from title if (_activitypub && _activitypub.tag && Array.isArray(_activitypub.tag)) {