Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-16 21:40:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2025-11-19 15:17:08 -05:00
parent cecc0fee54 76a07d5941
commit d4e3b42369
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/infinitescroll.js
View File

@@ -21,7 +21,7 @@ define('forum/infinitescroll', ['hooks', 'alerts', 'api'], function (hooks, aler
previousScrollTop = $(window).scrollTop(); previousScrollTop = $(window).scrollTop();
$(window).off('scroll', startScrollTimeout).on('scroll', startScrollTimeout); $(window).off('scroll', startScrollTimeout).on('scroll', startScrollTimeout);
if ($body.height() <= $(window).height() && ( if ($body.height() <= $(window).height() && (
!ajaxify.data.hasOwnProperty('pageCount') || ajaxify.data.pageCount > 1 ajaxify.data.pagination || ajaxify.data.pagination.pageCount > 1
)) { )) {
callback(1); callback(1);
} }

7
src/activitypub/mocks.js
View File

@@ -841,6 +841,13 @@ Mocks.notes.private = async ({ messageObj }) => {
const published = messageObj.timestampISO; const published = messageObj.timestampISO;
const updated = messageObj.edited ? messageObj.editedISO : undefined; 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; let source;
const markdownEnabled = await plugins.isActive('nodebb-plugin-markdown'); const markdownEnabled = await plugins.isActive('nodebb-plugin-markdown');
if (markdownEnabled) { if (markdownEnabled) {