diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js index eaf3e97720..6c3819245c 100644 --- a/public/src/client/infinitescroll.js +++ b/public/src/client/infinitescroll.js @@ -21,7 +21,7 @@ define('forum/infinitescroll', ['hooks', 'alerts', 'api'], function (hooks, aler previousScrollTop = $(window).scrollTop(); $(window).off('scroll', startScrollTimeout).on('scroll', startScrollTimeout); if ($body.height() <= $(window).height() && ( - !ajaxify.data.hasOwnProperty('pageCount') || ajaxify.data.pageCount > 1 + ajaxify.data.pagination || ajaxify.data.pagination.pageCount > 1 )) { callback(1); } diff --git a/src/activitypub/mocks.js b/src/activitypub/mocks.js index 3fe103f3b1..ff6bad4e6a 100644 --- a/src/activitypub/mocks.js +++ b/src/activitypub/mocks.js @@ -841,6 +841,13 @@ Mocks.notes.private = async ({ messageObj }) => { const published = messageObj.timestampISO; const updated = messageObj.edited ? messageObj.editedISO : undefined; + const content = await messaging.getMessageField(messageObj.mid, 'content'); + messageObj.content = content; // re-send raw content into parsePost + const parsed = await posts.parsePost(messageObj, 'activitypub.note'); + messageObj.content = sanitize(parsed.content, sanitizeConfig); + messageObj.content = posts.relativeToAbsolute(messageObj.content, posts.urlRegex); + messageObj.content = posts.relativeToAbsolute(messageObj.content, posts.imgRegex); + let source; const markdownEnabled = await plugins.isActive('nodebb-plugin-markdown'); if (markdownEnabled) {