closes #6487

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.8.2",
+    "version": "1.9.0",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -74,9 +74,9 @@
         "nodebb-plugin-spam-be-gone": "0.5.3",
         "nodebb-rewards-essentials": "0.0.11",
         "nodebb-theme-lavender": "5.0.4",
-        "nodebb-theme-persona": "9.0.3",
+        "nodebb-theme-persona": "9.0.4",
         "nodebb-theme-slick": "1.2.1",
-        "nodebb-theme-vanilla": "10.0.3",
+        "nodebb-theme-vanilla": "10.0.4",
         "nodebb-widget-essentials": "4.0.2",
         "nodemailer": "4.4.1",
         "passport": "^0.4.0",
@@ -144,4 +144,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

public/language/en-GB/error.json

@@ -177,5 +177,8 @@
 	"invalid-session-text": "It looks like your login session is no longer active, or no longer matches with the server. Please refresh this page.",
 
 	"no-topics-selected": "No topics selected!",
-	"cant-move-to-same-topic": "Can't move post to same topic!"
+	"cant-move-to-same-topic": "Can't move post to same topic!",
+
+	"cannot-block-self": "You cannot block yourself!",
+	"cannot-block-privileged": "You cannot block administrators or global moderators"
 }

public/src/client/account/blocks.js

@@ -22,11 +22,16 @@ define('forum/account/blocks', ['forum/account/header', 'autocomplete'], functio
 		});
 	};
 
-	Blocks.refreshList = function () {
+	Blocks.refreshList = function (err) {
+		if (err) {
+			return app.alertError(err.message);
+		}
+
 		$.get(config.relative_path + '/api/' + ajaxify.currentPage)
 			.done(function (payload) {
 				app.parseAndTranslate('account/blocks', 'users', payload, function (html) {
 					$('#users-container').html(html);
+					$('#users-container').siblings('div.alert')[html.length ? 'hide' : 'show']();
 				});
 			})
 			.fail(function () {

src/posts/uploads.js

@@ -73,9 +73,7 @@ module.exports = function (Posts) {
 
 	Posts.uploads.associate = function (pid, filePaths, callback) {
 		// Adds an upload to a post's sorted set of uploads
-		const now = Date.now();
 		filePaths = !Array.isArray(filePaths) ? [filePaths] : filePaths;
-		const scores = filePaths.map(() => now);
 
 		async.filter(filePaths, function (filePath, next) {
 			// Only process files that exist
@@ -83,10 +81,12 @@ module.exports = function (Posts) {
 				next(null, !err);
 			});
 		}, function (err, filePaths) {
-			let methods = [async.apply(db.sortedSetAdd.bind(db), 'post:' + pid + ':uploads', scores, filePaths)];
 			if (err) {
 				return callback(err);
 			}
+			const now = Date.now();
+			const scores = filePaths.map(() => now);
+			let methods = [async.apply(db.sortedSetAdd.bind(db), 'post:' + pid + ':uploads', scores, filePaths)];
 
 			methods = methods.concat(filePaths.map(path => async.apply(db.sortedSetAdd.bind(db), 'upload:' + md5(path) + ':pids', now, pid)));
 			async.parallel(methods, function (err) {

src/socket.io/user/profile.js

@@ -203,6 +203,15 @@ module.exports = function (SocketUser) {
 
 	SocketUser.toggleBlock = function (socket, data, callback) {
 		async.waterfall([
+			function (next) {
+				user.blocks.can(data.uid, function (err, can) {
+					if (err || !can) {
+						return next(err || new Error('[[error:cannot-block-privileged]]'));
+					}
+
+					next();
+				});
+			},
 			async.apply(user.blocks.is, data.uid, socket.uid),
 			function (is, next) {
 				user.blocks[is ? 'remove' : 'add'](data.uid, socket.uid, next);

src/user/blocks.js

@@ -19,6 +19,11 @@ module.exports = function (User) {
 		});
 	};
 
+	User.blocks.can = function (uid, callback) {
+		// Administrators and global moderators cannot be blocked
+		User.isAdminOrGlobalMod(uid, (err, can) => callback(err, !can));
+	};
+
 	User.blocks.list = function (uid, callback) {
 		if (User.blocks._cache.has(uid)) {
 			return setImmediate(callback, null, User.blocks._cache.get(uid));
@@ -37,7 +42,7 @@ module.exports = function (User) {
 
 	User.blocks.add = function (targetUid, uid, callback) {
 		async.waterfall([
-			async.apply(this.stateCheck, true, targetUid, uid),
+			async.apply(this.applyChecks, true, targetUid, uid),
 			async.apply(db.sortedSetAdd.bind(db), 'uid:' + uid + ':blocked_uids', Date.now(), targetUid),
 			async.apply(User.incrementUserFieldBy, uid, 'blocksCount', 1),
 			function (_blank, next) {
@@ -50,7 +55,7 @@ module.exports = function (User) {
 
 	User.blocks.remove = function (targetUid, uid, callback) {
 		async.waterfall([
-			async.apply(this.stateCheck, false, targetUid, uid),
+			async.apply(this.applyChecks, false, targetUid, uid),
 			async.apply(db.sortedSetRemove.bind(db), 'uid:' + uid + ':blocked_uids', targetUid),
 			async.apply(User.decrementUserFieldBy, uid, 'blocksCount', 1),
 			function (_blank, next) {
@@ -61,7 +66,11 @@ module.exports = function (User) {
 		], callback);
 	};
 
-	User.blocks.stateCheck = function (block, targetUid, uid, callback) {
+	User.blocks.applyChecks = function (block, targetUid, uid, callback) {
+		if (parseInt(targetUid, 10) === parseInt(uid, 10)) {
+			return setImmediate(callback, new Error('[[error:cannot-block-self]]'));
+		}
+
 		User.blocks.is(targetUid, uid, function (err, is) {
 			callback(err || (is === block ? new Error('[[error:already-' + (block ? 'blocked' : 'unblocked') + ']]') : null));
 		});