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

feat: update unban logic/invocation and refactor User.bans module

Browse Source 
* auto unban when User.getUsersFields is called and the user is banned but has expired

* cleanups and removal of expiry_readable

* expiry_readable make an alias for backward compatibility

* User.bans.func vs User.*ban*Func

* console.log cleanups, plus todo message added

* use code util.deprecate

* fix: remove ununsed winston require
This commit is contained in:
Aziz Khoury
2019-04-05 21:14:49 +03:00
committed by Julian Lam
parent ed91d3f2c8
commit 3fbb6faf28
11 changed files with 115 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/socket.io/user/ban.js
View File

@@ -55,7 +55,7 @@ module.exports = function (SocketUser) {
toggleBan(socket.uid, uids, function (uid, next) {
async.waterfall([
function (next) {
user.unban(uid, next);
user.bans.unban(uid, next);
},
function (next) {
events.log({
@@ -124,7 +124,7 @@ module.exports = function (SocketUser) {
});
},
function (next) {
user.ban(uid, until, reason, next);
user.bans.ban(uid, until, reason, next);
},
function (banData, next) {
db.setObjectField('uid:' + uid + ':ban:' + banData.timestamp, 'fromUid', callerUid, next);