Merge remote-tracking branch 'origin/master' into acp-privileges-redux

.eslintrc

@@ -24,7 +24,7 @@
 		"consistent-return": "off",
 		"func-names": "off",
 		"no-tabs": "off",
-		"indent": ["error", "tab"],
+		"indent": ["error", "tab", { "SwitchCase": 1 }],
 		"no-eq-null": "off",
 		"camelcase": "off",
 		"no-new": "off",

src/socket.io/admin/user.js

@@ -89,7 +89,7 @@ User.sendValidationEmail = async function (socket, uids) {
 	}
 
 	await async.eachLimit(uids, 50, async function (uid) {
-		await user.email.sendValidationEmail(uid);
+		await user.email.sendValidationEmail(uid, { force: true });
 	});
 };
 

src/user/delete.js

@@ -29,6 +29,7 @@ module.exports = function (User) {
 		await deletePosts(callerUid, uid);
 		await deleteTopics(callerUid, uid);
 		await deleteUploads(uid);
+		await deleteQueued(uid);
 		const userData = await User.deleteAccount(uid);
 		return userData;
 	};
@@ -58,6 +59,14 @@ module.exports = function (User) {
 		}, { alwaysStartAt: 0 });
 	}
 
+	async function deleteQueued(uid) {
+		await batch.processSortedSet('post:queue', async function (ids) {
+			const data = await db.getObjects(ids.map(id => 'post:queue:' + id));
+			const deleteIds = data.filter(d => parseInt(d.uid, 10) === parseInt(uid, 10)).map(d => d.id);
+			await async.eachSeries(deleteIds, posts.removeFromQueue);
+		}, { alwaysStartAt: 0 });
+	}
+
 	async function removeFromSortedSets(uid) {
 		await db.sortedSetsRemove([
 			'users:joindate',

test/controllers-admin.js

@@ -392,11 +392,14 @@ describe('Admin Controllers', function () {
 	});
 
 	it('should load /admin/advanced/errors/export', function (done) {
-		request(nconf.get('url') + '/api/admin/advanced/errors/export', { jar: jar }, function (err, res, body) {
+		meta.errors.clear(function (err) {
 			assert.ifError(err);
-			assert.equal(res.statusCode, 200);
-			assert.strictEqual(body, '');
-			done();
+			request(nconf.get('url') + '/api/admin/advanced/errors/export', { jar: jar }, function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert.strictEqual(body, '');
+				done();
+			});
 		});
 	});