Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 04:47:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate logic and double-parsing issue, #12834

Browse Source
This commit is contained in:
Julian Lam
2024-10-07 14:39:55 -04:00
parent 74d5ced29e
commit 8a1abe686c
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/activitypub/mocks.js
View File

@@ -458,7 +458,6 @@ Mocks.notes.private = async ({ messageObj }) => {
const to = new Set(uids); const to = new Set(uids);
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.parse(messageObj.content, messageObj.fromuid, 0, messageObj.roomId, false);
let source; let source;
const markdownEnabled = await plugins.isActive('nodebb-plugin-markdown'); const markdownEnabled = await plugins.isActive('nodebb-plugin-markdown');
@@ -499,7 +498,7 @@ Mocks.notes.private = async ({ messageObj }) => {
// audience: `${nconf.get('url')}/category/${post.category.cid}`, // audience: `${nconf.get('url')}/category/${post.category.cid}`,
summary: null, summary: null,
// name, // name,
content: content, content: messageObj.content,
source, source,
tag, tag,
// attachment: [], // todo // attachment: [], // todo

8
src/api/activitypub.js
View File

@@ -212,13 +212,7 @@ activitypubApi.create.note = enabledCheck(async (caller, { pid, post }) => {
} }
}); });
activitypubApi.create.privateNote = enabledCheck(async (caller, { mid, messageObj }) => { activitypubApi.create.privateNote = enabledCheck(async (caller, { messageObj }) => {
if (!messageObj) {
messageObj = await messaging.getMessageFields(mid, []);
if (!messageObj) {
throw new Error('[[error:invalid-data]]');
}
}
const { roomId } = messageObj; const { roomId } = messageObj;
let targets = await messaging.getUidsInRoom(roomId, 0, -1); let targets = await messaging.getUidsInRoom(roomId, 0, -1);
targets = targets.filter(uid => !utils.isNumber(uid)); // remote uids only targets = targets.filter(uid => !utils.isNumber(uid)); // remote uids only

1
src/controllers/activitypub/actors.js
View File

@@ -193,6 +193,7 @@ Actors.message = async function (req, res, next) {
} }
const messageObj = await messaging.getMessageFields(req.params.mid, []); const messageObj = await messaging.getMessageFields(req.params.mid, []);
messageObj.content = await messaging.parse(messageObj.content, messageObj.fromuid, 0, messageObj.roomId, false);
const payload = await activitypub.mocks.notes.private({ messageObj }); const payload = await activitypub.mocks.notes.private({ messageObj });
res.status(200).json(payload); res.status(200).json(payload);
}; };