Skip to content

Node.js based forum software built for the modern web

fix(activitypub): #14385, skip outbound update for scheduled topic edits

Julian Lam61758eabec5a
diff --git a/src/api/posts.js b/src/api/posts.js
index 2d221673d8..bf823e0ffa 100644
--- a/src/api/posts.js
+++ b/src/api/posts.js
@@ -149,10 +149,13 @@ postsAPI.edit = async function (caller, data) {
returnData.topic = { ...postObj[0].topic, ...editResult.post.topic };
if (!editResult.post.deleted) {
+ const topicScheduled = await topics.getTopicField(editResult.topic.tid, 'scheduled');
websockets.in(`topic_${editResult.topic.tid}`).emit('event:post_edited', editResult);
- setImmediate(() => {
- activitypub.out.update.note(caller.uid, postObj[0]);
- });
+ if (!topicScheduled) {
+ setImmediate(() => {
+ activitypub.out.update.note(caller.uid, postObj[0]);
+ });
+ }
return returnData;
}
diff --git a/test/topics.js b/test/topics.js
index 65421b7c37..25f3a723ad 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -11,6 +11,7 @@ const sleep = util.promisify(setTimeout);
const db = require('./mocks/databasemock');
const file = require('../src/file');
+const activitypub = require('../src/activitypub');
const topics = require('../src/topics');
const posts = require('../src/posts');
const categories = require('../src/categories');
@@ -25,6 +26,8 @@ const apiTopics = require('../src/api/topics');
const apiPosts = require('../src/api/posts');
const request = require('../src/request');
+const wait = util.promisify(setTimeout);
+
describe('Topic\'s', () => {
let topic;
let categoryObj;
@@ -2383,6 +2386,84 @@ describe('Topic\'s', () => {
assert.deepStrictEqual(isMember, [false, false, false]);
});
+ it('should send an ActivityPub Create activity for a non-scheduled topic with remote followers', async () => {
+ const helpers = require('./activitypub/helpers');
+ const { id: remoteActor } = helpers.mocks.person();
+ const { activity: followActivity } = helpers.mocks.follow({
+ actor: remoteActor,
+ object: {
+ id: `${nconf.get('url')}/uid/${adminUid}`,
+ },
+ });
+ await activitypub.inbox.follow({ body: followActivity });
+ activitypub._sent.clear();
+
+ const normalTopic = {
+ uid: adminUid,
+ cid: categoryObj.cid,
+ title: 'Normal Topic With AP',
+ content: 'This topic should be federated',
+ };
+ await apiTopics.create({ uid: adminUid }, normalTopic);
+ await wait(50);
+ assert.strictEqual(activitypub._sent.size, 1);
+ const sent = Array.from(activitypub._sent.values()).pop();
+ assert.strictEqual(sent.payload.type, 'Create');
+ assert(sent.targets.includes(remoteActor));
+ });
+
+ it('should not send out any ActivityPub activities for a scheduled topic', async () => {
+ const helpers = require('./activitypub/helpers');
+ const { id: remoteActor } = helpers.mocks.person();
+ const { activity: followActivity } = helpers.mocks.follow({
+ actor: remoteActor,
+ object: {
+ id: `${nconf.get('url')}/uid/${adminUid}`,
+ },
+ });
+ await activitypub.inbox.follow({ body: followActivity });
+ activitypub._sent.clear();
+
+ const scheduledTopic = {
+ uid: adminUid,
+ cid: categoryObj.cid,
+ title: 'Scheduled Topic No AP',
+ content: 'This topic should not be federated',
+ timestamp: new Date(Date.now() + 86400000).getTime(),
+ };
+ await apiTopics.create({ uid: adminUid }, scheduledTopic);
+ await wait(50);
+ assert.strictEqual(activitypub._sent.size, 0);
+ });
+
+ it('should not send out any ActivityPub activities when editing a post in a scheduled topic', async () => {
+ const helpers = require('./activitypub/helpers');
+ const { id: remoteActor } = helpers.mocks.person();
+ const { activity: followActivity } = helpers.mocks.follow({
+ actor: remoteActor,
+ object: {
+ id: `${nconf.get('url')}/uid/${adminUid}`,
+ },
+ });
+ await activitypub.inbox.follow({ body: followActivity });
+ activitypub._sent.clear();
+
+ const scheduledTopic = {
+ uid: adminUid,
+ cid: categoryObj.cid,
+ title: 'Scheduled Topic For Edit Test',
+ content: 'Original content',
+ timestamp: new Date(Date.now() + 86400000).getTime(),
+ };
+ const result = await apiTopics.create({ uid: adminUid }, scheduledTopic);
+ await sleep(50);
+ activitypub._sent.clear();
+
+ await apiPosts.edit({ uid: adminUid }, { pid: result.mainPid, content: 'Edited scheduled content', timestamp: new Date(Date.now() + 86400000).getTime() });
+ await sleep(50);
+ assert.strictEqual(activitypub._sent.size, 0);
+ });
+
it('should update poster\'s lastposttime with "action time"', async () => {
// src/user/posts.js:56
const data = await User.getUsersFields([adminUid], ['lastposttime']);