Merge branch 'master' into develop

src/api/topics.js

@@ -8,7 +8,6 @@ const meta = require('../meta');
 const privileges = require('../privileges');
 const events = require('../events');
 const batch = require('../batch');
-const activitypub = require('../activitypub');
 
 const activitypubApi = require('./activitypub');
 const apiHelpers = require('./helpers');

test/activitypub/feps.js

@@ -221,30 +221,6 @@ describe('FEPs', () => {
 			});
 
 			describe('extended actions not explicitly specified in 1b12', () => {
-				it('should be called when a topic is moved from uncategorized to another category', async () => {
-					const { topicData, postData } = await topics.post({
-						uid,
-						cid: -1,
-						title: utils.generateUUID(),
-						content: utils.generateUUID(),
-					});
-
-					assert(topicData);
-
-					await api.topics.move({ uid: adminUid }, {
-						tid: topicData.tid,
-						cid,
-					});
-
-					assert.strictEqual(activitypub._sent.size, 2);
-
-					const key = Array.from(activitypub._sent.keys())[0];
-					const activity = activitypub._sent.get(key);
-
-					assert(activity && activity.object && typeof activity.object === 'object');
-					assert.strictEqual(activity.object.id, `${nconf.get('url')}/post/${postData.pid}`);
-				});
-
 				it('should be called for a newly forked topic', async () => {
 					const { topicData } = await topics.post({
 						uid,