Skip to content

Node.js based forum software built for the modern web

fix(activitypub): federate posts accepted from post queue

Julian Lama46e2efefe63
diff --git a/src/activitypub/mocks.js b/src/activitypub/mocks.js
index 053223a221..fb262c68ce 100644
--- a/src/activitypub/mocks.js
+++ b/src/activitypub/mocks.js
@@ -1013,13 +1013,14 @@ Mocks.activities.dislike = async (pid, uid) => {
};
};
-Mocks.activities.announce = async (tid, uid) => {
+Mocks.activities.announce = async (tid, uid, overrideCid) => {
const { mainPid: pid, cid } = await topics.getTopicFields(tid, ['mainPid', 'cid']);
+ const announceCid = overrideCid || cid;
const authorUid = await posts.getPostField(pid, 'uid'); // author
const { to, cc, targets } = await activitypub.buildRecipients({
id: pid,
to: [activitypub._constants.publicAddress],
- }, uid ? { uid } : { cid });
+ }, uid ? { uid } : { cid: announceCid });
if (!utils.isNumber(authorUid)) {
cc.push(authorUid);
targets.add(authorUid);
@@ -1030,9 +1031,9 @@ Mocks.activities.announce = async (tid, uid) => {
type: 'Announce',
actor: `${nconf.get('url')}/uid/${uid}`,
} : {
- id: `${nconf.get('url')}/post/${encodeURIComponent(pid)}#activity/announce/cid/${cid}`,
+ id: `${nconf.get('url')}/post/${encodeURIComponent(pid)}#activity/announce/cid/${announceCid}`,
type: 'Announce',
- actor: `${nconf.get('url')}/category/${cid}`,
+ actor: `${nconf.get('url')}/category/${announceCid}`,
};
return {
diff --git a/src/activitypub/out.js b/src/activitypub/out.js
index 7120999daa..ccf10840ec 100644
--- a/src/activitypub/out.js
+++ b/src/activitypub/out.js
@@ -320,19 +320,18 @@ Out.dislike.note = enabledCheck(async (uid, pid) => {
Out.announce = {};
-Out.announce.topic = enabledCheck(async (tid, uid) => {
+Out.announce.topic = enabledCheck(async (tid, uid, overrideCid) => {
const { mainPid: pid, cid } = await topics.getTopicFields(tid, ['mainPid', 'cid']);
+ const announceCid = overrideCid || cid;
if (uid) {
const exists = await user.exists(uid);
if (!exists) {
return;
}
- } else {
+ } else if (!utils.isNumber(announceCid) || parseInt(announceCid, 10) < 1) {
// Only local categories can announce
- if (!utils.isNumber(cid) || parseInt(cid, 10) < 1) {
- return;
- }
+ return;
}
const allowed = await privileges.posts.can('topics:read', pid, activitypub._constants.uid);
@@ -341,8 +340,8 @@ Out.announce.topic = enabledCheck(async (tid, uid) => {
return;
}
- const { activity, targets } = await activitypub.mocks.activities.announce(tid, uid);
- await activitypub.send(uid ? 'uid' : 'cid', uid || cid, Array.from(targets), activity);
+ const { activity, targets } = await activitypub.mocks.activities.announce(tid, uid, announceCid);
+ await activitypub.send(uid ? 'uid' : 'cid', uid || announceCid, Array.from(targets), activity);
});
Out.flag = enabledCheck(async (uid, flag) => {
diff --git a/src/posts/queue.js b/src/posts/queue.js
index d8a2de903e..6db1f444bd 100644
--- a/src/posts/queue.js
+++ b/src/posts/queue.js
@@ -16,6 +16,7 @@ const utils = require('../utils');
const cache = require('../cache');
const socketHelpers = require('../socket.io/helpers');
const helpers = require('../helpers');
+const activitypub = require('../activitypub');
const upload_url = nconf.get('relative_path') + nconf.get('upload_url');
@@ -423,11 +424,17 @@ module.exports = function (Posts) {
async function createTopic(data) {
const result = await topics.post(data);
socketHelpers.notifyNew(data.uid, 'newTopic', { posts: [result.postData], topic: result.topicData });
+ setImmediate(() => {
+ activitypub.out.create.note(data.uid, result.postData.pid);
+ });
return result;
}
async function createCrosspost(data) {
await topics.crossposts.add(data.tid, data.crosspostCid, 0);
+ setImmediate(() => {
+ activitypub.out.announce.topic(data.tid, undefined, data.crosspostCid);
+ });
return { tid: data.tid };
}
@@ -439,6 +446,9 @@ module.exports = function (Posts) {
'downvote:disabled': !!meta.config['downvote:disabled'],
};
socketHelpers.notifyNew(data.uid, 'newPost', result);
+ setImmediate(() => {
+ activitypub.out.create.note(data.uid, postData.pid);
+ });
return postData;
}