Node.js based forum software built for the modern web
feat: refactor out.announce.topic to allow user announces, refactor tests to accommodate
Julian Lam874ffd7b2666
diff --git a/src/activitypub/out.js b/src/activitypub/out.jsindex b49cf62630..4e11c243ef 100644--- a/src/activitypub/out.js+++ b/src/activitypub/out.js@@ -305,12 +305,19 @@ Out.dislike.note = enabledCheck(async (uid, pid) => {Out.announce = {};-Out.announce.topic = enabledCheck(async (tid) => {+Out.announce.topic = enabledCheck(async (tid, uid) => {const { mainPid: pid, cid } = await topics.getTopicFields(tid, ['mainPid', 'cid']);- // Only local categories can announce- if (!utils.isNumber(cid) || parseInt(cid, 10) < 1) {- return;+ if (uid) {+ const exists = await user.exists(uid);+ if (!exists || !utils.isNumber(cid)) {+ return;+ }+ } else {+ // Only local categories can announce+ if (!utils.isNumber(cid) || parseInt(cid, 10) < 1) {+ return;+ }}const authorUid = await posts.getPostField(pid, 'uid'); // author@@ -323,16 +330,23 @@ Out.announce.topic = enabledCheck(async (tid) => {const { to, cc, targets } = await activitypub.buildRecipients({id: pid,to: [activitypub._constants.publicAddress],- }, { cid });+ }, uid ? { uid } : { cid });if (!utils.isNumber(authorUid)) {cc.push(authorUid);targets.add(authorUid);}- await activitypub.send('cid', cid, Array.from(targets), {+ const payload = uid ? {+ id: `${nconf.get('url')}/post/${encodeURIComponent(pid)}#activity/announce/uid/${uid}`,+ type: 'Announce',+ actor: `${nconf.get('url')}/uid/${uid}`,+ } : {id: `${nconf.get('url')}/post/${encodeURIComponent(pid)}#activity/announce/cid/${cid}`,type: 'Announce',actor: `${nconf.get('url')}/category/${cid}`,+ };+ await activitypub.send(uid ? 'uid' : 'cid', uid || cid, Array.from(targets), {+ ...payload,to,cc,object: utils.isNumber(pid) ? `${nconf.get('url')}/post/${pid}` : pid,diff --git a/test/activitypub/out.js b/test/activitypub/out.jsindex 673b86416f..e5c02a67a9 100644--- a/test/activitypub/out.js+++ b/test/activitypub/out.js@@ -22,84 +22,133 @@ describe('Outbound activities module', () => {});describe('.announce', () => {- describe('.topic() (remote topic; by cid)', () => {- let pid;- let note;- let tid;- let cid;-- before(async () => {- ({ id: pid, note } = helpers.mocks.note());- ({ cid } = await categories.create({ name: utils.generateUUID() }));- await activitypub.notes.assert(0, pid, { skipChecks: 1, cid });- tid = await posts.getPostField(pid, 'tid');+ function commonTests() {+ it('should not error when called', async function () {+ await activitypub.out.announce.topic(this.tid, this.uid);+ const { payload, targets } = Array.from(activitypub._sent).pop()[1];+ this.payload = payload;+ this.targets = targets;});- after(() => {- activitypub._sent.clear();+ it('should send an Announce activity', function () {+ assert.strictEqual(activitypub._sent.size, 1);+ assert.strictEqual(this.payload.type, 'Announce');});- it('should not error when called', async () => {- await activitypub.out.announce.topic(tid);+ it('should contain the main post\'s pid in object', function () {+ assert.strictEqual(this.payload.object, this.pid);});- it('should send an Announce activity', () => {- assert.strictEqual(activitypub._sent.size, 1);+ it('should have actor as the calling user or category as appropriate', function () {+ if (this.uid) {+ assert.strictEqual(this.payload.actor, `${nconf.get('url')}/uid/${this.uid}`);+ } else {+ assert.strictEqual(this.payload.actor, `${nconf.get('url')}/category/${this.cid}`);+ }+ });+ }++ describe('.topic() (remote topic; by cid)', () => {+ before(async function () {+ const { id: pid, note } = helpers.mocks.note();+ const { cid } = await categories.create({ name: utils.generateUUID() });+ await activitypub.notes.assert(0, pid, { skipChecks: 1, cid });- const { payload } = Array.from(activitypub._sent).pop()[1];- assert.strictEqual(payload.type, 'Announce');+ this.pid = pid;+ this.note = note;+ this.cid = cid;+ this.tid = await posts.getPostField(pid, 'tid');});- it('should contain the main post\'s pid in object', () => {- const { payload } = Array.from(activitypub._sent).pop()[1];- assert.strictEqual(payload.object, pid);+ after(() => {+ activitypub._sent.clear();});- it('should include the category\'s followers collection in cc', () => {- const { payload } = Array.from(activitypub._sent).pop()[1];- assert(payload.cc.includes(`${nconf.get('url')}/category/${cid}/followers`));+ commonTests();++ it('should include the category\'s followers collection in cc', function () {+ assert(this.payload.cc.includes(`${nconf.get('url')}/category/${this.cid}/followers`));});- it('should include the author in cc', () => {- const { payload } = Array.from(activitypub._sent).pop()[1];- assert(payload.cc.includes(note.attributedTo));+ it('should include the author in cc', function () {+ assert(this.payload.cc.includes(this.note.attributedTo));});- it('should include the author in targets', () => {- const { targets } = Array.from(activitypub._sent).pop()[1];- assert(targets.includes(note.attributedTo));+ it('should include the author in targets', function () {+ assert(this.targets.includes(this.note.attributedTo));});});describe('.topic() (local topic; by cid)', () => {- let uid;- let tid;- let cid;-- before(async () => {- uid = await user.create({ username: utils.generateUUID().slice(0, 10) });- ({ cid } = await categories.create({ name: utils.generateUUID() }));- const { topicData } = await topics.post({+ before(async function () {+ const uid = await user.create({ username: utils.generateUUID().slice(0, 10) });+ const { cid } = await categories.create({ name: utils.generateUUID() });+ const { postData, topicData } = await topics.post({cid, uid,title: utils.generateUUID(),content: utils.generateUUID(),});- ({ tid } = topicData);++ this.tid = topicData.tid;+ this.cid = cid;+ this.pid = `${nconf.get('url')}/post/${topicData.mainPid}`;+ this.note = await activitypub.mocks.notes.public(postData);+ });++ after(() => {+ activitypub._sent.clear();+ });++ commonTests();++ it('should include the topic\'s mainPid in object', async function () {+ const mainPid = await topics.getTopicField(this.tid, 'mainPid');+ assert.strictEqual(this.payload.object, `${nconf.get('url')}/post/${mainPid}`);+ });+ });++ describe('.topic() (remote topic; by uid)', () => {+ before(async function () {+ const uid = await user.create({ username: utils.generateUUID().slice(0, 10) });+ const { id: pid, note } = helpers.mocks.note();++ await activitypub.notes.assert(0, pid, { skipChecks: 1 });++ this.pid = pid;+ this.note = note;+ this.tid = await posts.getPostField(pid, 'tid');+ this.uid = uid;});after(() => {activitypub._sent.clear();});- it('should not error when called', async () => {- await activitypub.out.announce.topic(tid);+ commonTests();+ });++ describe('.topic() (local topic; by uid)', () => {+ before(async function () {+ const uid = await user.create({ username: utils.generateUUID().slice(0, 10) });+ const { cid } = await categories.create({ name: utils.generateUUID() });+ const { postData, topicData } = await topics.post({+ cid, uid,+ title: utils.generateUUID(),+ content: utils.generateUUID(),+ });++ this.tid = topicData.tid;+ this.cid = cid;+ this.pid = `${nconf.get('url')}/post/${topicData.mainPid}`;+ this.note = await activitypub.mocks.notes.public(postData);+ this.uid = uid;});- it('should include the topic\'s mainPid in object', async () => {- const mainPid = await topics.getTopicField(tid, 'mainPid');- const { payload } = Array.from(activitypub._sent).pop()[1];- assert.strictEqual(payload.object, `${nconf.get('url')}/post/${mainPid}`);+ after(() => {+ activitypub._sent.clear();});++ commonTests();});});});\ No newline at end of file