Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added block and unblock button to profile dropdown menu, #6560

Browse Source
This commit is contained in:
Julian Lam
2018-07-05 14:18:29 -04:00
parent a34584e8f5
commit 7a53fa9469
6 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controllers/accounts/helpers.js
View File

@@ -91,6 +91,9 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
canBanUser: function (next) {
privileges.users.canBanUser(callerUID, uid, next);
},
isBlocked: function (next) {
user.blocks.is(uid, callerUID, next);
},
}, next);
},
function (results, next) {
@@ -129,6 +132,11 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
userData.moderationNote = undefined;
}
userData.isBlocked = results.isBlocked;
if (isAdmin || isSelf) {
userData.blocksCount = parseInt(userData.blocksCount, 10) || 0;
}
userData.yourid = callerUID;
userData.theirid = userData.uid;
userData.isTargetAdmin = results.isTargetAdmin;
@@ -165,7 +173,6 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), '');
userData.followingCount = parseInt(userData.followingCount, 10) || 0;
userData.followerCount = parseInt(userData.followerCount, 10) || 0;
userData.blocksCount = parseInt(userData.blocksCount, 10) || 0;
userData.email = validator.escape(String(userData.email || ''));
userData.fullname = validator.escape(String(userData.fullname || ''));