refactor: move all input note normalization into helper method, have assertPrivate mock a message object (with said normalization) before sending message

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

install/data/defaults.json

@@ -147,7 +147,6 @@
     "username:disableEdit": 0,
     "email:disableEdit": 0,
     "email:smtpTransport:pool": 0,
-    "email:smtpTransport:allow-self-signed": 0,
     "hideFullname": 0,
     "hideEmail": 0,
     "showFullnameAsDisplayName": 0,

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "4.1.1",
+    "version": "4.1.0",
     "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -63,7 +63,7 @@
         "connect-pg-simple": "10.0.0",
         "connect-redis": "8.0.1",
         "cookie-parser": "1.4.7",
-        "cron": "4.0.0",
+        "cron": "4.1.0",
         "cropperjs": "1.6.2",
         "csrf-sync": "4.0.3",
         "daemon": "1.1.0",
@@ -93,7 +93,7 @@
         "lru-cache": "10.4.3",
         "mime": "3.0.0",
         "mkdirp": "3.0.1",
-        "mongodb": "6.13.1",
+        "mongodb": "6.14.0",
         "morgan": "1.10.0",
         "mousetrap": "1.6.5",
         "multiparty": "4.2.3",
@@ -108,10 +108,10 @@
         "nodebb-plugin-spam-be-gone": "2.3.1",
         "nodebb-plugin-web-push": "0.7.3",
         "nodebb-rewards-essentials": "1.0.1",
-        "nodebb-theme-harmony": "2.0.39",
-        "nodebb-theme-lavender": "7.1.18",
+        "nodebb-theme-harmony": "2.0.38",
+        "nodebb-theme-lavender": "7.1.17",
         "nodebb-theme-peace": "2.2.39",
-        "nodebb-theme-persona": "14.0.16",
+        "nodebb-theme-persona": "14.0.15",
         "nodebb-widget-essentials": "7.0.35",
         "nodemailer": "6.10.0",
         "nprogress": "0.2.0",
@@ -140,13 +140,13 @@
         "@socket.io/redis-adapter": "8.3.0",
         "sortablejs": "1.15.6",
         "spdx-license-list": "6.9.0",
-        "terser-webpack-plugin": "5.3.11",
+        "terser-webpack-plugin": "5.3.12",
         "textcomplete": "0.18.2",
         "textcomplete.contenteditable": "0.1.1",
         "timeago": "1.6.7",
         "tinycon": "0.6.8",
         "toobusy-js": "0.5.1",
-        "tough-cookie": "5.1.1",
+        "tough-cookie": "5.1.2",
         "validator": "13.12.0",
         "webpack": "5.98.0",
         "webpack-merge": "6.0.1",

public/language/en-GB/admin/manage/categories.json

@@ -94,7 +94,6 @@
 	"federation.followers-handle": "Handle",
 	"federation.followers-id": "ID",
 	"federation.followers-none": "No followers.",
-	"federation.followers-autofill": "Autofill",
 
 	"alert.created": "Created",
 	"alert.create-success": "Category successfully created!",

public/language/en-GB/admin/settings/email.json

@@ -28,8 +28,6 @@
 	"smtp-transport.password": "Password",
 	"smtp-transport.pool": "Enable pooled connections",
 	"smtp-transport.pool-help": "Pooling connections prevents NodeBB from creating a new connection for every email. This option only applies if SMTP Transport is enabled.",
-	"smtp-transport.allow-self-signed": "Allow self-signed certificates",
-	"smtp-transport.allow-self-signed-help": "Enabling this setting will allow you to use self-signed or invalid TLS certificates.",
 
 	"template": "Edit Email Template",
 	"template.select": "Select Email Template",

public/language/en-GB/category.json

@@ -3,6 +3,7 @@
 	"subcategories": "Subcategories",
 	"uncategorized": "Uncategorized",
 	"uncategorized.description": "Topics that do not strictly fit in with any existing categories",
+	"handle.description": "This category can be followed from the open social web via the handle %1",
 	"new-topic-button": "New Topic",
 	"guest-login-post": "Log in to post",
 	"no-topics": "<strong>There are no topics in this category.</strong><br />Why don't you try posting one?",

public/language/vi/admin/dashboard.json

@@ -31,7 +31,7 @@
 	"prerelease-upgrade-available": "Đây là phiên bản trước khi phát hành đã lỗi thời của NodeBB. Một phiên bản mới (v%1) đã được phát hành. Cân nhắc <a href=\"https://docs.nodebb.org/configuring/upgrade/\" target=\"_blank\">nâng cấp NodeBB của bạn</a>.",
 	"prerelease-warning": "Đây là một phiên bản NodeBB <strong>trước khi phát hành</strong>. Lỗi ngoài ý muốn có thể xảy ra. <i class=\"fa fa-exclamation-triangle\"></i>",
 	"fallback-emailer-not-found": "Không tìm thấy trình gửi email dự phòng!",
-	"running-in-development": "Diễn đàn đang chạy ở chế độ phát triển. Diễn đàn có thể mở ra các lỗ hổng tiềm ẩn; Xin vui lòng liên hệ với quản trị hệ thống của bạn",
+	"running-in-development": "Diễn đàn đang chạy ở chế độ phát triển. Diễn đàn có thể mở ra các lỗ hổng tiềm ẩn; hãy liên hệ với quản trị hệ thống của bạn",
 	"latest-lookup-failed": "Không tìm được phiên bản mới nhất hiện có của NodeBB",
 
 	"notices": "Thông báo",
@@ -49,7 +49,7 @@
 	"maintenance-mode": "Chế Độ Bảo Trì",
 	"maintenance-mode-title": "Bấm vào đây để thiết lập chế độ bảo trì cho NodeBB",
 	"dark-mode": "Chế Độ Tối",
-	"realtime-chart-updates": "Cập Nhật Biểu Đồ Thời Gian Thực",
+	"realtime-chart-updates": "Biểu Đồ Thời Gian Thực",
 
 	"active-users": "Người Dùng Hoạt Động",
 	"active-users.users": "Người Dùng",
@@ -57,11 +57,11 @@
 	"active-users.total": "Tổng",
 	"active-users.connections": "Kết nối",
 
-	"guest-registered-users": "Khách vs Người dùng đã đăng ký",
+	"guest-registered-users": "Khách vs Người Đã Đăng Ký",
 	"guest": "Khách",
 	"registered": "Đã đăng ký",
 
-	"user-presence": "Người Dùng Có Mặt",
+	"user-presence": "Người Có Mặt",
 	"on-categories": "Trên danh sách danh mục",
 	"reading-posts": "Đọc bài viết",
 	"browsing-topics": "Lướt xem chủ đề",
@@ -69,7 +69,7 @@
 	"unread": "Chưa đọc",
 
 	"high-presence-topics": "Chủ Đề Hiện Diện Cao",
-	"popular-searches": "Tìm kiếm Phổ biến",
+	"popular-searches": "Tìm Kiếm Phổ Biến",
 
 	"graphs.page-views": "Xem Trang",
 	"graphs.page-views-registered": "Đã Đăng Ký Xem Trang",

public/language/vi/admin/manage/registration.json

@@ -14,7 +14,7 @@
 	"invitations.description": "Dưới đây là danh sách hoàn tất các lời mời đã gửi. Bấm ctrl-f để tìm kiếm trong danh sách bằng email hoặc tên đăng nhập. <br><br>Tên đăng nhập sẽ hiển thị bên phải email cho những người dùng đã đổi lời mời của họ.",
 	"invitations.inviter-username": "Tên Đăng Nhập Người Mời",
 	"invitations.invitee-email": "Email của người được mời",
-	"invitations.invitee-username": "Tên Đăng Nhập Người Được Mời (nếu đã đăng ký)",
+	"invitations.invitee-username": "Mời Tên Đăng Nhập (nếu đã đăng ký)",
 
 	"invitations.confirm-delete": "Bạn có chắc chắn muốn xóa lời mời này không?"
 } 

public/language/vi/error.json

@@ -62,7 +62,7 @@
     "no-post": "Bài đăng không tồn tại",
     "no-group": "Nhóm không tồn tại",
     "no-user": "Người dùng không tồn tại",
-    "no-teaser": "Đoạn giới thiệu không tồn tại",
+    "no-teaser": "Xem thử không tồn tại",
     "no-flag": "Cờ không tồn tại",
     "no-chat-room": "Phòng trò chuyện không tồn tại",
     "no-privileges": "Bạn không đủ đặc quyền cho hành động này.",
@@ -88,7 +88,7 @@
     "content-too-long": "Hãy nhập một bài đăng ngắn hơn. Bài đăng không thể dài hơn %1 ký tự.",
     "title-too-short": "Hãy nhập tiêu đề dài hơn. Tiêu đề nên có ít nhất %1 ký tự.",
     "title-too-long": "Hãy nhập tiêu đề ngắn hơn. Tiêu đề không thể dài hơn %1 ký tự.",
-    "category-not-selected": "Danh mục không được chọn.",
+    "category-not-selected": "Chưa chọn danh mục.",
     "too-many-posts": "Bạn chỉ có đăng một bài mới mỗi %1 giây - vui lòng đợi để tiếp tục đăng bài.",
     "too-many-posts-newbie": "Là người mới, bạn chỉ có thể đăng %1 giây một lần cho đến khi bạn đạt được %2 danh tiếng - vui lòng đợi trước khi đăng lại",
     "too-many-posts-newbie-minutes": "Là người mới, bạn chỉ được đăng bài %1 phút một lần cho đến khi bạn đạt được %2 danh tiếng - vui lòng đợi trước khi đăng lại",

public/language/vi/topic.json

@@ -23,7 +23,7 @@
     "delete": "Xóa",
     "delete-event": "Xóa Sự Kiện",
     "delete-event-confirm": "Bạn có chắc muốn xóa sự kiện này không?",
-    "purge": "Xóa hẳn",
+    "purge": "Loại bỏ",
     "restore": "Khôi phục",
     "move": "Di chuyển",
     "change-owner": "Đổi Chủ Sở Hữu",

public/src/client/category.js

@@ -10,7 +10,8 @@ define('forum/category', [
 	'hooks',
 	'alerts',
 	'api',
-], function (infinitescroll, share, navigator, topicList, sort, categorySelector, hooks, alerts, api) {
+	'clipboard',
+], function (infinitescroll, share, navigator, topicList, sort, categorySelector, hooks, alerts, api, clipboard) {
 	const Category = {};
 
 	$(window).on('action:ajaxify.start', function (ev, data) {
@@ -48,6 +49,8 @@ define('forum/category', [
 			},
 		});
 
+		new clipboard('[data-clipboard-text]');
+
 		hooks.fire('action:topics.loaded', { topics: ajaxify.data.topics });
 		hooks.fire('action:category.loaded', { cid: ajaxify.data.cid });
 	};

src/activitypub/actors.js

@@ -73,7 +73,9 @@ Actors.assert = async (ids, options = {}) => {
 	}
 
 	// Filter out loopback uris
-	ids = ids.filter(uri => uri !== 'loopback' && new URL(uri).host !== nconf.get('url_parsed').host);
+	if (!meta.config.activitypubAllowLoopback) {
+		ids = ids.filter(uri => uri !== 'loopback' && new URL(uri).host !== nconf.get('url_parsed').host);
+	}
 
 	// Only assert those who haven't been seen recently (configurable), unless update flag passed in (force refresh)
 	if (!options.update) {

src/activitypub/feps.js

@@ -3,6 +3,7 @@
 const nconf = require('nconf');
 
 const posts = require('../posts');
+const utils = require('../utils');
 
 const activitypub = module.parent.exports;
 const Feps = module.exports;
@@ -68,8 +69,10 @@ Feps.announceObject = async function announceObject(id) {
 		return;
 	}
 
-	const author = await posts.getPostField(id, 'uid');
-	if (!author.startsWith(nconf.get('url'))) {
+	let author = await posts.getPostField(id, 'uid');
+	if (utils.isNumber(author)) {
+		author = `${nconf.get('url')}/uid/${author}`;
+	} else if (!author.startsWith(nconf.get('url'))) {
 		followers.unshift(author);
 	}
 
@@ -80,6 +83,6 @@ Feps.announceObject = async function announceObject(id) {
 		actor: `${nconf.get('url')}/category/${cid}`,
 		to: [`${nconf.get('url')}/category/${cid}/followers`],
 		cc: [author, activitypub._constants.publicAddress],
-		object: id,
+		object: utils.isNumber(id) ? `${nconf.get('url')}/post/${id}` : id,
 	});
 };

src/activitypub/inbox.js

@@ -297,6 +297,7 @@ inbox.announce = async (req) => {
 		}
 
 		({ tid } = assertion);
+		await topics.updateLastPostTime(tid, timestamp);
 		await activitypub.notes.updateLocalRecipients(pid, { to, cc });
 		await activitypub.notes.syncUserInboxes(tid);
 	}

src/activitypub/index.js

@@ -48,6 +48,7 @@ ActivityPub._constants = Object.freeze({
 	},
 });
 ActivityPub._cache = requestCache;
+ActivityPub._sent = new Map(); // used only in local tests
 
 ActivityPub.helpers = require('./helpers');
 ActivityPub.inbox = require('./inbox');
@@ -335,7 +336,7 @@ pubsub.on(`activitypub-retry-queue:lruCache:del`, (keys) => {
 async function sendMessage(uri, id, type, payload, attempts = 1) {
 	const keyData = await ActivityPub.getPrivateKey(type, id);
 	const headers = await ActivityPub.sign(keyData, uri, payload);
-	ActivityPub.helpers.log(`[activitypub/send] ${uri}`);
+
 	try {
 		const { response, body } = await request.post(uri, {
 			headers: {
@@ -375,6 +376,11 @@ ActivityPub.send = async (type, id, targets, payload) => {
 		return ActivityPub.helpers.log('[activitypub/send] Federation not enabled; not sending.');
 	}
 
+	ActivityPub.helpers.log(`[activitypub/send] ${payload.id}`);
+	if (process.env.hasOwnProperty('CI')) {
+		ActivityPub._sent.set(payload.id, payload);
+	}
+
 	if (!Array.isArray(targets)) {
 		targets = [targets];
 	}

src/activitypub/mocks.js

@@ -40,6 +40,95 @@ const sanitizeConfig = {
 	},
 };
 
+Mocks._normalize = async (object) => {
+	// Normalized incoming AP objects into expected types for easier mocking
+	let { attributedTo, url, image, content, source } = object;
+
+	switch (true) { // non-string attributedTo handling
+		case Array.isArray(attributedTo): {
+			attributedTo = attributedTo.reduce((valid, cur) => {
+				if (typeof cur === 'string') {
+					valid.push(cur);
+				} else if (typeof cur === 'object') {
+					if (cur.type === 'Person' && cur.id) {
+						valid.push(cur.id);
+					}
+				}
+
+				return valid;
+			}, []);
+			attributedTo = attributedTo.shift(); // take first valid uid
+			break;
+		}
+
+		case typeof attributedTo === 'object' && attributedTo.hasOwnProperty('id'): {
+			attributedTo = attributedTo.id;
+		}
+	}
+
+	let sourceContent = source && source.mediaType === 'text/markdown' ? source.content : undefined;
+	if (sourceContent) {
+		content = null;
+		sourceContent = await activitypub.helpers.remoteAnchorToLocalProfile(sourceContent, true);
+	} else if (content && content.length) {
+		content = sanitize(content, sanitizeConfig);
+		content = await activitypub.helpers.remoteAnchorToLocalProfile(content);
+	} else {
+		content = '<em>This post did not contain any content.</em>';
+	}
+
+	switch (true) {
+		case image && image.hasOwnProperty('url') && !!image.url: {
+			image = image.url;
+			break;
+		}
+
+		case image && typeof image === 'string': {
+			// no change
+			break;
+		}
+
+		default: {
+			image = null;
+		}
+	}
+	if (image) {
+		const parsed = new URL(image);
+		if (!mime.getType(parsed.pathname).startsWith('image/')) {
+			activitypub.helpers.log(`[activitypub/mocks.post] Received image not identified as image due to MIME type: ${image}`);
+			image = null;
+		}
+	}
+
+	if (url) { // Handle url array
+		if (Array.isArray(url)) {
+			url = url.reduce((valid, cur) => {
+				if (typeof cur === 'string') {
+					valid.push(cur);
+				} else if (typeof cur === 'object') {
+					if (cur.type === 'Link' && cur.href) {
+						if (!cur.mediaType || (cur.mediaType && cur.mediaType === 'text/html')) {
+							valid.push(cur.href);
+						}
+					}
+				}
+
+				return valid;
+			}, []);
+			url = url.shift(); // take first valid url
+		}
+	}
+
+	return {
+		...object,
+		attributedTo,
+		content,
+		sourceContent,
+		image,
+		url,
+	};
+};
+
 Mocks.profile = async (actors, hostMap) => {
 	// Should only ever be called by activitypub.actors.assert
 	const profiles = await Promise.all(actors.map(async (actor) => {
@@ -154,6 +243,8 @@ Mocks.post = async (objects) => {
 	}
 
 	const posts = await Promise.all(objects.map(async (object) => {
+		object = await Mocks._normalize(object);
+
 		if (
 			!activitypub._constants.acceptedPostTypes.includes(object.type) ||
 			!activitypub.helpers.isUri(object.id) // sanity-check the id
@@ -166,25 +257,11 @@ Mocks.post = async (objects) => {
 			url,
 			attributedTo: uid,
 			inReplyTo: toPid,
-			published, updated, name, content, source,
+			published, updated, name, content, sourceContent,
 			type, to, cc, audience, attachment, tag, image,
 		} = object;
 
-		if (Array.isArray(uid)) { // Handle array attributedTo
-			uid = uid.reduce((valid, cur) => {
-				if (typeof cur === 'string') {
-					valid.push(cur);
-				} else if (typeof cur === 'object') {
-					if (cur.type === 'Person' && cur.id) {
-						valid.push(cur.id);
-					}
-				}
-
-				return valid;
-			}, []);
-			uid = uid.shift(); // take first valid uid
-			await activitypub.actors.assert(uid);
-		}
+		await activitypub.actors.assert(uid);
 
 		const resolved = await activitypub.helpers.resolveLocalId(toPid);
 		if (resolved.type === 'post') {
@@ -195,59 +272,6 @@ Mocks.post = async (objects) => {
 		let edited = new Date(updated);
 		edited = Number.isNaN(edited.valueOf()) ? undefined : edited;
 
-		let sourceContent = source && source.mediaType === 'text/markdown' ? source.content : undefined;
-		if (sourceContent) {
-			content = null;
-			sourceContent = await activitypub.helpers.remoteAnchorToLocalProfile(sourceContent, true);
-		} else if (content && content.length) {
-			content = sanitize(content, sanitizeConfig);
-			content = await activitypub.helpers.remoteAnchorToLocalProfile(content);
-		} else {
-			content = '<em>This post did not contain any content.</em>';
-		}
-
-		switch (true) {
-			case image && image.hasOwnProperty('url') && !!image.url: {
-				image = image.url;
-				break;
-			}
-
-			case image && typeof image === 'string': {
-				// no change
-				break;
-			}
-
-			default: {
-				image = null;
-			}
-		}
-		if (image) {
-			const parsed = new URL(image);
-			if (!mime.getType(parsed.pathname).startsWith('image/')) {
-				activitypub.helpers.log(`[activitypub/mocks.post] Received image not identified as image due to MIME type: ${image}`);
-				image = null;
-			}
-		}
-
-		if (url) { // Handle url array
-			if (Array.isArray(url)) {
-				url = url.reduce((valid, cur) => {
-					if (typeof cur === 'string') {
-						valid.push(cur);
-					} else if (typeof cur === 'object') {
-						if (cur.type === 'Link' && cur.href) {
-							if (!cur.mediaType || (cur.mediaType && cur.mediaType === 'text/html')) {
-								valid.push(cur.href);
-							}
-						}
-					}
-
-					return valid;
-				}, []);
-				url = url.shift(); // take first valid url
-			}
-		}
-
 		if (type === 'Video') {
 			attachment = attachment || [];
 			attachment.push({ url });
@@ -274,6 +298,19 @@ Mocks.post = async (objects) => {
 	return single ? posts.pop() : posts;
 };
 
+Mocks.message = async (object) => {
+	object = await Mocks._normalize(object);
+
+	const message = {
+		mid: object.id,
+		uid: object.attributedTo,
+		content: object.content,
+		// ip: caller.ip,
+	};
+
+	return message;
+};
+
 Mocks.actors = {};
 
 Mocks.actors.user = async (uid) => {

src/activitypub/notes.js

@@ -286,31 +286,30 @@ Notes.assertPrivate = async (object) => {
 		timestamp = Date.now();
 	}
 
+	const payload = await activitypub.mocks.message(object);
+
 	if (!roomId) {
-		roomId = await messaging.newRoom(object.attributedTo, { uids: [...recipients] });
+		roomId = await messaging.newRoom(payload.uid, { uids: [...recipients] });
 	}
 
 	// Add any new members to the chat
 	const added = Array.from(recipients).filter(uid => !participantUids.includes(uid));
 	const assertion = await activitypub.actors.assert(added);
 	if (assertion) {
-		await messaging.addUsersToRoom(object.attributedTo, added, roomId);
+		await messaging.addUsersToRoom(payload.uid, added, roomId);
 	}
 
 	// Add message to room
 	const message = await messaging.sendMessage({
-		mid: object.id,
-		uid: object.attributedTo,
-		roomId: roomId,
-		content: object.content,
-		toMid: toMid,
+		...payload,
 		timestamp: Date.now(),
-		// ip: caller.ip,
+		roomId: roomId,
+		toMid: toMid,
 	});
-	messaging.notifyUsersInRoom(object.attributedTo, roomId, message);
+	messaging.notifyUsersInRoom(payload.uid, roomId, message);
 
 	// Set real timestamp back so that the message shows even though it predates room joining
-	await messaging.setMessageField(object.id, 'timestamp', timestamp);
+	await messaging.setMessageField(payload.mid, 'timestamp', timestamp);
 
 	return { roomId };
 };

src/controllers/admin/uploads.js

@@ -3,8 +3,6 @@
 const path = require('path');
 const nconf = require('nconf');
 const fs = require('fs');
-const winston = require('winston');
-const sanitizeHtml = require('sanitize-html');
 
 const meta = require('../../meta');
 const posts = require('../../posts');
@@ -24,15 +22,9 @@ uploadsController.get = async function (req, res, next) {
 	}
 	const itemsPerPage = 20;
 	const page = parseInt(req.query.page, 10) || 1;
-	let files = [];
-	try {
-		await checkSymLinks(req.query.dir);
-		files = await getFilesInFolder(currentFolder);
-	} catch (err) {
-		winston.error(err.stack);
-		return next(new Error('[[error:invalid-path]]'));
-	}
 	try {
+		let files = await fs.promises.readdir(currentFolder);
+		files = files.filter(filename => filename !== '.gitignore');
 		const itemCount = files.length;
 		const start = Math.max(0, (page - 1) * itemsPerPage);
 		const stop = start + itemsPerPage;
@@ -72,34 +64,6 @@ uploadsController.get = async function (req, res, next) {
 	}
 };
 
-async function checkSymLinks(folder) {
-	let dir = path.normalize(folder || '');
-	while (dir.length && dir !== '.') {
-		const nextPath = path.join(nconf.get('upload_path'), dir);
-		// eslint-disable-next-line no-await-in-loop
-		const stat = await fs.promises.lstat(nextPath);
-		if (stat.isSymbolicLink()) {
-			throw new Error('[[invalid-path]]');
-		}
-		const newDir = path.dirname(dir);
-		if (newDir === dir) {
-			break;
-		}
-		dir = newDir;
-	}
-}
-
-async function getFilesInFolder(folder) {
-	const dirents = await fs.promises.readdir(folder, { withFileTypes: true });
-	const files = [];
-	for await (const dirent of dirents) {
-		if (!dirent.isSymbolicLink() && dirent.name !== '.gitignore') {
-			files.push(dirent.name);
-		}
-	}
-	return files;
-}
-
 function buildBreadcrumbs(currentFolder) {
 	const crumbs = [];
 	const parts = currentFolder.replace(nconf.get('upload_path'), '').split(path.sep);
@@ -130,14 +94,14 @@ async function getFileData(currentDir, file) {
 	const stat = await fs.promises.stat(pathToFile);
 	let filesInDir = [];
 	if (stat.isDirectory()) {
-		filesInDir = await getFilesInFolder(pathToFile);
+		filesInDir = await fs.promises.readdir(pathToFile);
 	}
 	const url = `${nconf.get('upload_url') + currentDir.replace(nconf.get('upload_path'), '')}/${file}`;
 	return {
 		name: file,
 		path: pathToFile.replace(path.join(nconf.get('upload_path'), '/'), ''),
 		url: url,
-		fileCount: filesInDir.length,
+		fileCount: Math.max(0, filesInDir.length - 1), // ignore .gitignore
 		size: stat.size,
 		sizeHumanReadable: `${(stat.size / 1024).toFixed(1)}KiB`,
 		isDirectory: stat.isDirectory(),
@@ -157,50 +121,11 @@ uploadsController.uploadCategoryPicture = async function (req, res, next) {
 		return next(new Error('[[error:invalid-json]]'));
 	}
 
-	if (uploadedFile.path.endsWith('.svg')) {
-		await sanitizeSvg(uploadedFile.path);
-	}
-
 	await validateUpload(uploadedFile, allowedImageTypes);
 	const filename = `category-${params.cid}${path.extname(uploadedFile.name)}`;
 	await uploadImage(filename, 'category', uploadedFile, req, res, next);
 };
 
-async function sanitizeSvg(filePath) {
-	const dirty = await fs.promises.readFile(filePath, 'utf8');
-	const clean = sanitizeHtml(dirty, {
-		allowedTags: [
-			'svg', 'g', 'defs', 'linearGradient', 'radialGradient', 'stop',
-			'circle', 'ellipse', 'polygon', 'polyline', 'path', 'rect',
-			'line', 'text', 'tspan', 'use', 'symbol', 'clipPath', 'mask', 'pattern',
-			'filter', 'feGaussianBlur', 'feOffset', 'feBlend', 'feColorMatrix', 'feMerge', 'feMergeNode',
-		],
-		allowedAttributes: {
-			'*': [
-				// Geometry
-				'x', 'y', 'x1', 'x2', 'y1', 'y2', 'cx', 'cy', 'r', 'rx', 'ry',
-				'width', 'height', 'd', 'points', 'viewBox', 'transform',
-
-				// Presentation
-				'fill', 'stroke', 'stroke-width', 'opacity',
-				'stop-color', 'stop-opacity', 'offset', 'style', 'class',
-
-				// Text
-				'text-anchor', 'font-size', 'font-family',
-
-				// Misc
-				'id', 'clip-path', 'mask', 'filter', 'gradientUnits', 'gradientTransform',
-				'xmlns', 'preserveAspectRatio',
-			],
-		},
-		parser: {
-			lowerCaseTags: false,
-			lowerCaseAttributeNames: false,
-		},
-	});
-	await fs.promises.writeFile(filePath, clean);
-}
-
 uploadsController.uploadFavicon = async function (req, res, next) {
 	const uploadedFile = req.files.files[0];
 	const allowedTypes = ['image/x-icon', 'image/vnd.microsoft.icon'];
@@ -272,9 +197,6 @@ uploadsController.uploadFile = async function (req, res, next) {
 		return next(new Error('[[error:invalid-json]]'));
 	}
 
-	if (!await file.exists(path.join(nconf.get('upload_path'), params.folder))) {
-		return next(new Error('[[error:invalid-path]]'));
-	}
 	try {
 		const data = await file.saveFileToLocal(uploadedFile.name, params.folder, uploadedFile.path);
 		res.json([{ url: data.url }]);

src/controllers/category.js

@@ -10,6 +10,7 @@ const privileges = require('../privileges');
 const user = require('../user');
 const categories = require('../categories');
 const meta = require('../meta');
+const activitypub = require('../activitypub');
 const pagination = require('../pagination');
 const helpers = require('./helpers');
 const utils = require('../utils');
@@ -161,6 +162,12 @@ categoryController.get = async function (req, res, next) {
 	if (meta.config.activitypubEnabled) {
 		// Include link header for richer parsing
 		res.set('Link', `<${nconf.get('url')}/actegory/${cid}>; rel="alternate"; type="application/activity+json"`);
+
+		// Category accessible
+		const remoteOk = await privileges.categories.can('read', cid, activitypub._constants.uid);
+		if (remoteOk) {
+			categoryData.handleFull = `${categoryData.handle}@${nconf.get('url_parsed').host}`;
+		}
 	}
 
 	res.render('category', categoryData);

src/emailer.js

@@ -153,11 +153,7 @@ Emailer.setupFallbackTransport = (config) => {
 		} else {
 			smtpOptions.service = String(config['email:smtpTransport:service']);
 		}
-		if (config['email:smtpTransport:allow-self-signed']) {
-			smtpOptions.tls = {
-				rejectUnauthorized: false,
-			};
-		}
+
 		Emailer.transports.smtp = nodemailer.createTransport(smtpOptions);
 		Emailer.fallbackTransport = Emailer.transports.smtp;
 	} else {

src/messaging/unread.js

@@ -18,6 +18,9 @@ module.exports = function (Messaging) {
 			uids = [uids];
 		}
 		uids = uids.filter(uid => parseInt(uid, 10) > 0);
+		if (!uids.length) {
+			return;
+		}
 		uids.forEach((uid) => {
 			io.in(`uid_${uid}`).emit('event:unread.updateChatCount', data);
 		});

src/meta/configs.js

@@ -132,7 +132,6 @@ Configs.setMultiple = async function (data) {
 	await processConfig(data);
 	data = serialize(data);
 	await db.setObject('config', data);
-	await updateNavItems(data);
 	updateConfig(deserialize(data));
 };
 
@@ -229,13 +228,6 @@ async function getLogoSize(data) {
 	data['brand:emailLogo:width'] = size.width;
 }
 
-async function updateNavItems(data) {
-	if (data.hasOwnProperty('activitypubEnabled')) {
-		const navAdmin = require('../navigation/admin');
-		await navAdmin.update('/world', { enabled: data.activitypubEnabled ? 'on' : '' });
-	}
-}
-
 function updateConfig(config) {
 	updateLocalConfig(config);
 	pubsub.publish('config:update', config);

src/navigation/admin.js

@@ -85,19 +85,6 @@ admin.get = async function () {
 	return cache.map(item => ({ ...item }));
 };
 
-admin.update = async function (route, data) {
-	const ids = await db.getSortedSetRange('navigation:enabled', 0, -1);
-	const navItems = await db.getObjects(ids.map(id => `navigation:enabled:${id}`));
-	const matchedRoutes = navItems.filter(item => item && item.route === route);
-	if (matchedRoutes.length) {
-		await db.setObjectBulk(
-			matchedRoutes.map(item => [`navigation:enabled:${item.order}`, data])
-		);
-		cache = null;
-		pubsub.publish('admin:navigation:save');
-	}
-};
-
 async function getAvailable() {
 	const core = require('../../install/data/navigation.json').map((item) => {
 		item.core = true;

src/socket.io/meta.js

@@ -6,23 +6,20 @@ const user = require('../user');
 const meta = require('../meta');
 const topics = require('../topics');
 const privileges = require('../privileges');
-const messaging = require('../messaging');
 
 const SocketMeta = module.exports;
 SocketMeta.rooms = {};
 
-SocketMeta.reconnected = async function (socket) {
-	if (socket.uid > 0) {
-		await Promise.all([
-			topics.pushUnreadCount(socket.uid),
-			user.notifications.pushCount(socket.uid),
-			messaging.pushUnreadCount(socket.uid),
-		]);
+SocketMeta.reconnected = function (socket, data, callback) {
+	callback = callback || function () {};
+	if (socket.uid) {
+		topics.pushUnreadCount(socket.uid);
+		user.notifications.pushCount(socket.uid);
 	}
-	return {
+	callback(null, {
 		'cache-buster': meta.config['cache-buster'],
 		hostname: os.hostname(),
-	};
+	});
 };
 
 /* Rooms */

src/topics/fork.js

@@ -7,6 +7,7 @@ const categories = require('../categories');
 const privileges = require('../privileges');
 const plugins = require('../plugins');
 const meta = require('../meta');
+const activitypub = require('../activitypub');
 
 module.exports = function (Topics) {
 	Topics.createTopicFromPosts = async function (uid, title, pids, fromTid, cid) {
@@ -38,29 +39,25 @@ module.exports = function (Topics) {
 			cid = await posts.getCidByPid(mainPid);
 		}
 
-		const [mainPost, isAdminOrMod] = await Promise.all([
+		const [postData, isAdminOrMod] = await Promise.all([
 			posts.getPostData(mainPid),
 			privileges.categories.isAdminOrMod(cid, uid),
 		]);
-		let lastPost = mainPost;
-		if (pids.length > 1) {
-			lastPost = await posts.getPostData(pids[pids.length - 1]);
-		}
 
 		if (!isAdminOrMod) {
 			throw new Error('[[error:no-privileges]]');
 		}
-		const now = Date.now();
-		const scheduled = mainPost.timestamp > now;
+
+		const scheduled = postData.timestamp > Date.now();
 		const params = {
-			uid: mainPost.uid,
+			uid: postData.uid,
 			title: title,
 			cid: cid,
-			timestamp: mainPost.timestamp,
+			timestamp: scheduled && postData.timestamp,
 		};
 		const result = await plugins.hooks.fire('filter:topic.fork', {
 			params: params,
-			tid: mainPost.tid,
+			tid: postData.tid,
 		});
 
 		const tid = await Topics.create(result.params);
@@ -75,21 +72,22 @@ module.exports = function (Topics) {
 			await Topics.movePostToTopic(uid, pid, tid, scheduled);
 		}
 
-		await Topics.updateLastPostTime(tid, scheduled ? (mainPost.timestamp + 1) : lastPost.timestamp);
+		await Topics.updateLastPostTime(tid, scheduled ? (postData.timestamp + 1) : Date.now());
 
 		await Promise.all([
 			Topics.setTopicFields(tid, {
-				upvotes: mainPost.upvotes,
-				downvotes: mainPost.downvotes,
+				upvotes: postData.upvotes,
+				downvotes: postData.downvotes,
 				forkedFromTid: fromTid,
 				forkerUid: uid,
-				forkTimestamp: now,
+				forkTimestamp: Date.now(),
 			}),
-			db.sortedSetsAdd(['topics:votes', `cid:${cid}:tids:votes`], mainPost.votes, tid),
+			db.sortedSetsAdd(['topics:votes', `cid:${cid}:tids:votes`], postData.votes, tid),
 			Topics.events.log(fromTid, { type: 'fork', uid, href: `/topic/${tid}` }),
+			activitypub.feps.announceObject(pids[0]),
 		]);
 
-		plugins.hooks.fire('action:topic.fork', { tid, fromTid, uid });
+		plugins.hooks.fire('action:topic.fork', { tid: tid, fromTid: fromTid, uid: uid });
 
 		return await Topics.getTopicData(tid);
 	};

src/user/email.js

@@ -124,22 +124,23 @@ UserEmail.sendValidationEmail = async function (uid, options) {
 		};
 	}
 
+	const confirm_code = utils.generateUUID();
+	const confirm_link = `${nconf.get('url')}/confirm/${confirm_code}`;
+
+	const { emailConfirmInterval, emailConfirmExpiry } = meta.config;
+
 	// If no email passed in (default), retrieve email from uid
 	if (!options.email || !options.email.length) {
 		options.email = await user.getUserField(uid, 'email');
 	}
 	if (!options.email) {
-		winston.warn(`[user/email] No email found for uid ${uid}`);
 		return;
 	}
 
-	const { emailConfirmInterval, emailConfirmExpiry } = meta.config;
 	if (!options.force && !await UserEmail.canSendValidation(uid, options.email)) {
 		throw new Error(`[[error:confirm-email-already-sent, ${emailConfirmInterval}]]`);
 	}
 
-	const confirm_code = utils.generateUUID();
-	const confirm_link = `${nconf.get('url')}/confirm/${confirm_code}`;
 	const username = await user.getUserField(uid, 'username');
 	const data = await plugins.hooks.fire('filter:user.verify', {
 		uid,

src/views/admin/manage/category-federation.tpl

@@ -14,85 +14,85 @@
 		<a class="btn btn-primary" href="{config.relative_path}/admin/settings/activitypub">[[admin/manage/categories:federation.disabled-cta]]</a>
 	</div>
 	{{{ else }}}
-	<div class="row settings m-0">
-		<div class="col-12 px-0 mb-4" tabindex="0">
-			<div id="site-settings" class="mb-4">
-				<form role="form">
-					<h5 class="fw-bold settings-header">[[admin/manage/categories:federation.syncing-header]]</h5>
-					<p>[[admin/manage/categories:federation.syncing-intro]]</p>
-					<p class="form-text">[[admin/manage/categories:federation.syncing-caveat]]</p>
+	<div class="acp-page-container">
+		<div class="row settings m-0">
+			<div class="col-12 col-md-8 px-0 mb-4" tabindex="0">
+				<div id="site-settings" class="mb-4">
+					<form role="form">
+						<h5 class="fw-bold settings-header">[[admin/manage/categories:federation.syncing-header]]</h5>
+						<p>[[admin/manage/categories:federation.syncing-intro]]</p>
+						<p class="form-text">[[admin/manage/categories:federation.syncing-caveat]]</p>
 
-					{{{ if !following.length }}}
-					<div class="alert alert-info">[[admin/manage/categories:federation.syncing-none]]</div>
-					{{{ else }}}
-					<table class="table">
-						<thead>
-							<tr>
-								<th>[[admin/manage/categories:federation.syncing-actorUri]]</th>
-								<th></th>
-							</tr>
-						</thead>
-						<tbody>
-							{{{ each following }}}
-							<tr>
-								<td>
-									<pre class="mb-0 mt-1">{./id}</pre>
-									{{{ if !./approved }}}
-									<span class="form-text text-warning">Pending</span>
-									{{{ end }}}
-								</td>
-								<td>
-									<button type="button" data-action="unfollow" data-actor="{./id}" class="btn btn-sm btn-danger">[[admin/manage/categories:federation.syncing-unfollow]]</button>
-								</td>
-							</tr>
-							{{{ end }}}
-						</tbody>
-					</table>
-					{{{ end }}}
-
-					<div class="mb-3">
-						<label class="form-label" for="syncing-add">[[admin/manage/categories:federation.syncing-add]]</label>
-						<div class="input-group">
-							<input id="syncing-add" type="url" class="form-control" />
-							<button data-action="follow" type="button" class="btn btn-primary">[[admin/manage/categories:federation.syncing-follow]]</button>
-						</div>
-					</div>
-
-					<hr />
-
-					<div class="mb-3">
-						<p>[[admin/manage/categories:federation.followers]]</p>
-						<table class="table small">
-							<tr>
-								<th>[[admin/manage/categories:federation.followers-handle]]</th>
-								<th>[[admin/manage/categories:federation.followers-id]]</th>
-							</tr>
-							{{{ if !followers.length}}}
-							<tr>
-								<td class="text-center border-0" colspan="2">
-									<em>[[admin/manage/categories:federation.followers-none]]</em>
-								</td>
-							</tr>
-							{{{ end }}}
-							{{{ each followers }}}
-							<tr data-uid="{./uid}">
-								<td class="w-100 text-truncate" style="max-width: 1px;">
-									{buildAvatar(followers, "24px", true)}
-									{./userslug}
-								</td>
-								<td class="w-0">
-									<div class="d-flex gap-2 flex-nowrap align-items-center">
-										<button type="button" class="btn btn-ghost btn-sm border" data-action="autofill" title="[[admin/manage/categories:federation.followers-autofill]]">
-											<i class="fa fa-exchange-alt text-primary"></i>
-										</button>
-										<code>{./uid}</code>
-									</div>
-								</td>
-							</tr>
-							{{{ end }}}
+						{{{ if !following.length }}}
+						<div class="alert alert-info">[[admin/manage/categories:federation.syncing-none]]</div>
+						{{{ else }}}
+						<table class="table">
+							<thead>
+								<tr>
+									<th>[[admin/manage/categories:federation.syncing-actorUri]]</th>
+									<th></th>
+								</tr>
+							</thead>
+							<tbody>
+								{{{ each following }}}
+								<tr>
+									<td>
+										<pre class="mb-0 mt-1">{./id}</pre>
+										{{{ if !./approved }}}
+										<span class="form-text text-warning">Pending</span>
+										{{{ end }}}
+									</td>
+									<td>
+										<button type="button" data-action="unfollow" data-actor="{./id}" class="btn btn-sm btn-danger">[[admin/manage/categories:federation.syncing-unfollow]]</button>
+									</td>
+								</tr>
+								{{{ end }}}
+							</tbody>
 						</table>
-					</div>
-				</form>
+						{{{ end }}}
+
+						<div class="mb-3">
+							<label class="form-label" for="syncing-add">[[admin/manage/categories:federation.syncing-add]]</label>
+							<div class="input-group">
+								<input id="syncing-add" type="url" class="form-control" />
+								<button data-action="follow" type="button" class="btn btn-primary">[[admin/manage/categories:federation.syncing-follow]]</button>
+							</div>
+						</div>
+
+						<hr />
+
+						<div class="mb-3">
+							<p>[[admin/manage/categories:federation.followers]]</p>
+							<table class="table small">
+								<tr>
+									<th>[[admin/manage/categories:federation.followers-handle]]</th>
+									<th>[[admin/manage/categories:federation.followers-id]]</th>
+								</tr>
+								{{{ if !followers.length}}}
+								<tr>
+									<td class="text-center border-0" colspan="2">
+										<em>[[admin/manage/categories:federation.followers-none]]</em>
+									</td>
+								</tr>
+								{{{ end }}}
+								{{{ each followers }}}
+								<tr data-uid="{./uid}">
+									<td>
+										{buildAvatar(followers, "24px", true)}
+										{./userslug}
+									</td>
+									<td>
+										<code>{./uid}</code>
+										<button type="button" class="btn btn-link" data-action="autofill">
+											<i class="fa fa-exchange-alt"></i>
+										</button>
+									</td>
+								</tr>
+								{{{ end }}}
+							</table>
+						</div>
+					</form>
+				</div>
 			</div>
 		</div>
 	</div>

src/views/admin/settings/email.tpl

@@ -116,11 +116,6 @@
 					<label for="email:smtpTransport:pool" class="form-check-label">[[admin/settings/email:smtp-transport.pool]]</label>
 					<p class="form-text">[[admin/settings/email:smtp-transport.pool-help]]</p>
 				</div>
-				<div class="form-check form-switch mb-3">
-					<input class="form-check-input" type="checkbox" id="email:smtpTransport:allow-self-signed" data-field="email:smtpTransport:allow-self-signed" name="email:smtpTransport:allow-self-signed" />
-					<label for="email:smtpTransport:allow-self-signed" class="form-check-label">[[admin/settings/email:smtp-transport.allow-self-signed]]</label>
-					<p class="form-text">[[admin/settings/email:smtp-transport.allow-self-signed-help]]</p>
-				</div>
 				<div class="mb-3">
 					<label class="form-label" for="email:smtpTransport:service">[[admin/settings/email:smtp-transport.service]]</label>
 					<select class="form-select" id="email:smtpTransport:service" data-field="email:smtpTransport:service">

test/activitypub.js

@@ -21,6 +21,7 @@ const activitypub = require('../src/activitypub');
 describe('ActivityPub integration', () => {
 	before(async () => {
 		meta.config.activitypubEnabled = 1;
+		meta.config.activitypubAllowLoopback = 1;
 		await install.giveWorldPrivileges();
 	});
 
@@ -28,6 +29,16 @@ describe('ActivityPub integration', () => {
 		delete meta.config.activitypubEnabled;
 	});
 
+	describe('Outgoing AP logging for test runner', () => {
+		it('should log an entry in ActivityPub._sent when .send is called', async () => {
+			const uuid = utils.generateUUID();
+			const uid = await user.create({ username: uuid });
+			await activitypub.send('uid', 0, [`https://localhost/uid/${uid}`], { id: `${nconf.get('url')}/activity/${uuid}`, foo: 'bar' });
+
+			assert(activitypub._sent.has(`${nconf.get('url')}/activity/${uuid}`));
+		});
+	});
+
 	describe('Master toggle', () => {
 		before(async () => {
 			delete meta.config.activitypubEnabled;

test/activitypub/feps.js

@@ -0,0 +1,95 @@
+'use strict';
+
+const assert = require('assert');
+const nconf = require('nconf');
+
+const db = require('../mocks/databasemock');
+const activitypub = require('../../src/activitypub');
+const utils = require('../../src/utils');
+const meta = require('../../src/meta');
+const install = require('../../src/install');
+const user = require('../../src/user');
+const groups = require('../../src/groups');
+const categories = require('../../src/categories');
+const topics = require('../../src/topics');
+const api = require('../../src/api');
+
+const helpers = require('./helpers');
+
+describe('FEPs', () => {
+	before(async () => {
+		meta.config.activitypubEnabled = 1;
+		await install.giveWorldPrivileges();
+	});
+
+	describe.only('1b12', () => {
+		describe('announceObject()', () => {
+			let cid;
+			let uid;
+			let adminUid;
+
+			before(async () => {
+				const name = utils.generateUUID();
+				const description = utils.generateUUID();
+				({ cid } = await categories.create({ name, description }));
+
+				adminUid = await user.create({ username: utils.generateUUID() });
+				await groups.join('administrators', adminUid);
+				uid = await user.create({ username: utils.generateUUID() });
+
+				const { id: followerId, actor } = helpers.mocks.actor();
+				activitypub._cache.set(`0;${followerId}`, actor);
+				user.setCategoryWatchState(followerId, [cid], categories.watchStates.tracking);
+
+				activitypub._sent.clear();
+			});
+
+			afterEach(() => {
+				activitypub._sent.clear();
+			});
+
+			it('should be called when a topic is moved from uncategorized to another category', async () => {
+				const { topicData } = 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, 1);
+			});
+
+			it('should be called for a newly forked topic', async () => {
+				const { topicData } = await topics.post({
+					uid,
+					cid: -1,
+					title: utils.generateUUID(),
+					content: utils.generateUUID(),
+				});
+				const { tid } = topicData;
+				const [{ pid: reply1Pid }, { pid: reply2Pid }] = await Promise.all([
+					topics.reply({ uid, tid, content: utils.generateUUID() }),
+					topics.reply({ uid, tid, content: utils.generateUUID() }),
+				]);
+				const forked = await topics.createTopicFromPosts(
+					adminUid, utils.generateUUID(), [reply1Pid, reply2Pid], tid, cid
+				);
+
+				assert.strictEqual(activitypub._sent.size, 1);
+
+				const key = Array.from(activitypub._sent.keys())[0];
+				const activity = activitypub._sent.get(key);
+
+				assert(activity);
+				assert.strictEqual(activity.object, `${nconf.get('url')}/post/${reply1Pid}`);
+			});
+		});
+	});
+});

test/activitypub/helpers.js

@@ -1,12 +1,42 @@
 'use strict';
 
-const utils = require('../../src/utils');
 const activitypub = require('../../src/activitypub');
+const utils = require('../../src/utils');
+const slugify = require('../../src/slugify');
 
 const Helpers = module.exports;
 
 Helpers.mocks = {};
 
+Helpers.mocks.actor = () => {
+	const baseUrl = 'https://example.org';
+	const uuid = utils.generateUUID();
+	const id = `${baseUrl}/${uuid}`;
+
+	const actor = {
+		'@context': [
+			'https://www.w3.org/ns/activitystreams',
+			'https://w3id.org/security/v1',
+		],
+		id: `${id}`,
+		url: `${id}`,
+		inbox: `${id}/inbox`,
+		outbox: `${id}/outbox`,
+
+		type: 'Person',
+		name: slugify(uuid),
+		preferredUsername: uuid,
+
+		publicKey: {
+			id: `${id}#key`,
+			owner: `${id}`,
+			publicKeyPem: 'todo',
+		},
+	};
+
+	return { id, actor };
+};
+
 Helpers.mocks.note = (override = {}) => {
 	const baseUrl = 'https://example.org';
 	const uuid = utils.generateUUID();

test/activitypub/notes.js

@@ -3,7 +3,7 @@
 const assert = require('assert');
 const nconf = require('nconf');
 
-const db = require('../../src/database');
+const db = require('../mocks/databasemock');
 const meta = require('../../src/meta');
 const install = require('../../src/install');
 const user = require('../../src/user');

test/navigation.js

@@ -1,24 +0,0 @@
-'use strict';
-
-const assert = require('assert');
-
-const db = require('./mocks/databasemock');
-const meta = require('../src/meta');
-const navAdmin = require('../src/navigation/admin');
-
-describe('Navigation', () => {
-	before(async () => {
-		const data = require('../install/data/navigation.json');
-		await navAdmin.save(data);
-	});
-
-	it('should toggle /world route when ap is toggled', async () => {
-		let nav = await navAdmin.get();
-		let world = nav.find(item => item.route === '/world');
-		assert.strictEqual(!!world.enabled, true);
-		await meta.configs.setMultiple({ activitypubEnabled: 0 });
-		nav = await navAdmin.get();
-		world = nav.find(item => item.route === '/world');
-		assert.strictEqual(!!world.enabled, false);
-	});
-});

test/socket.io.js

@@ -269,9 +269,12 @@ describe('socket.io', () => {
 		});
 	});
 
-	it('should push unread notifications/chats on reconnect', async () => {
+	it('should push unread notifications on reconnect', (done) => {
 		const socketMeta = require('../src/socket.io/meta');
-		await socketMeta.reconnected({ uid: 1 }, {});
+		socketMeta.reconnected({ uid: 1 }, {}, (err) => {
+			assert.ifError(err);
+			done();
+		});
 	});
 
 

test/uploads.js

@@ -400,17 +400,6 @@ describe('Upload Controllers', () => {
 			assert.strictEqual(body.error, '[[error:invalid-path]]');
 		});
 
-		it('should fail to upload regular file if directory does not exist', async () => {
-			const { response, body } = await helpers.uploadFile(`${nconf.get('url')}/api/admin/upload/file`, path.join(__dirname, '../test/files/test.png'), {
-				params: JSON.stringify({
-					folder: 'does-not-exist',
-				}),
-			}, jar, csrf_token);
-
-			assert.equal(response.statusCode, 500);
-			assert.strictEqual(body.error, '[[error:invalid-path]]');
-		});
-
 		describe('ACP uploads screen', () => {
 			it('should create a folder', async () => {
 				const { response } = await helpers.createFolder('', 'myfolder', jar, csrf_token);