Merge branch 'master' into develop

src/activitypub/inbox.js

@@ -36,7 +36,7 @@ inbox.create = async (req) => {
 	const { object } = req.body;
 
 	// Alternative logic for non-public objects
-	const isPublic = [...object.to, ...object.cc].includes(activitypub._constants.publicAddress);
+	const isPublic = [...(object.to || []), ...(object.cc || [])].includes(activitypub._constants.publicAddress);
 	if (!isPublic) {
 		return await activitypub.notes.assertPrivate(object);
 	}

src/activitypub/notes.js

@@ -234,7 +234,7 @@ Notes.assertPrivate = async (object) => {
 	}
 
 	const localUids = [];
-	const recipients = new Set([...object.to, ...object.cc]);
+	const recipients = new Set([...(object.to || []), ...(object.cc || [])]);
 	await Promise.all(Array.from(recipients).map(async (value) => {
 		const { type, id } = await activitypub.helpers.resolveLocalId(value);
 		if (type === 'user') {

test/activitypub/notes.js

@@ -1,42 +1,30 @@
 'use strict';
 
 const assert = require('assert');
+const nconf = require('nconf');
 
 const db = require('../../src/database');
 const meta = require('../../src/meta');
 const install = require('../../src/install');
 const user = require('../../src/user');
 const categories = require('../../src/categories');
+const posts = require('../../src/posts');
 const topics = require('../../src/topics');
 const activitypub = require('../../src/activitypub');
 const utils = require('../../src/utils');
 
+const helpers = require('./helpers');
+
 describe('Notes', () => {
 	describe('Assertion', () => {
-		const baseUrl = 'https://example.org';
-
 		before(async () => {
 			meta.config.activitypubEnabled = 1;
 			await install.giveWorldPrivileges();
 		});
 
+		describe('Public objects', () => {
 			it('should pull a remote root-level object by its id and create a new topic', async () => {
-			const uuid = utils.generateUUID();
+				const { id } = helpers.mocks.note();
-			const id = `${baseUrl}/resource/${uuid}`;
-			activitypub._cache.set(`0;${id}`, {
-				'@context': 'https://www.w3.org/ns/activitystreams',
-				id,
-				url: id,
-				type: 'Note',
-				to: ['https://www.w3.org/ns/activitystreams#Public'],
-				cc: ['https://example.org/user/foobar/followers'],
-				inReplyTo: null,
-				attributedTo: 'https://example.org/user/foobar',
-				name: 'Foo Bar',
-				content: '<b>Baz quux</b>',
-				published: new Date().toISOString(),
-			});
-
 				const { tid, count } = await activitypub.notes.assert(0, id, { skipChecks: true });
 				assert.strictEqual(count, 1);
 
@@ -45,21 +33,7 @@ describe('Notes', () => {
 			});
 
 			it('should assert if the cc property is missing', async () => {
-			const uuid = utils.generateUUID();
+				const { id } = helpers.mocks.note({ cc: 'remove' });
-			const id = `${baseUrl}/resource/${uuid}`;
-			activitypub._cache.set(`0;${id}`, {
-				'@context': 'https://www.w3.org/ns/activitystreams',
-				id,
-				url: id,
-				type: 'Note',
-				to: ['https://www.w3.org/ns/activitystreams#Public'],
-				inReplyTo: null,
-				attributedTo: 'https://example.org/user/foobar',
-				name: 'Foo Bar',
-				content: '<b>Baz quux</b>',
-				published: new Date().toISOString(),
-			});
-
 				const { tid, count } = await activitypub.notes.assert(0, id, { skipChecks: true });
 				assert.strictEqual(count, 1);
 
@@ -68,6 +42,40 @@ describe('Notes', () => {
 			});
 		});
 
+		describe('Private objects', () => {
+			let recipientUid;
+
+			before(async () => {
+				recipientUid = await user.create({ username: utils.generateUUID().slice(0, 8) });
+			});
+
+			it('should NOT create a new topic or post when asserting a private note', async () => {
+				const { id, note } = helpers.mocks.note({
+					to: [`${nconf.get('url')}/uid/${recipientUid}`],
+					cc: [],
+				});
+				const { activity } = helpers.mocks.create(note);
+				const { roomId } = await activitypub.inbox.create({ body: activity });
+				assert(roomId);
+				assert(utils.isNumber(roomId));
+
+				const exists = await posts.exists(id);
+				assert(!exists);
+			});
+
+			it('should still assert if the cc property is missing', async () => {
+				const { id, note } = helpers.mocks.note({
+					to: [`${nconf.get('url')}/uid/${recipientUid}`],
+					cc: 'remove',
+				});
+				const { activity } = helpers.mocks.create(note);
+				const { roomId } = await activitypub.inbox.create({ body: activity });
+				assert(roomId);
+				assert(utils.isNumber(roomId));
+			});
+		});
+	});
+
 	describe('Inbox Synchronization', () => {
 		let cid;
 		let uid;