Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 04:21:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6487

Browse Source
This commit is contained in:
Julian Lam
2018-05-04 12:39:00 -04:00
parent 96d2980472
commit 8e275df803
5 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/socket.io/user/profile.js
View File

@@ -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);

15
src/user/blocks.js
View File

@@ -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));
});