Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-20 01:30:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into flagging-refactor

Browse Source
This commit is contained in:
Julian Lam
2016-12-14 14:45:25 -05:00
parent e6768ab572 e17b37edb6
commit 5e109bb4a8
9 changed files with 103 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/user/bans.js
View File

@@ -42,15 +42,7 @@ module.exports = function (User) {
}
async.series(tasks, function (err) {
if (err) {
return callback(err);
}
plugins.fireHook('action:user.banned', {
uid: uid,
until: until > 0 ? until : undefined
});
callback();
callback(err);
});
};
@@ -61,10 +53,6 @@ module.exports = function (User) {
},
function (next) {
db.sortedSetsRemove(['users:banned', 'users:banned:expire'], uid, next);
},
function (next) {
plugins.fireHook('action:user.unbanned', {uid: uid});
next();
}
], callback);
};

2
src/user/create.js
View File

@@ -88,7 +88,7 @@ module.exports = function (User) {
},
function (next) {
var sets = ['users:joindate', 'users:online'];
if (parseInt(userData.uid) !== 1) {
if (parseInt(userData.uid, 10) !== 1) {
sets.push('users:notvalidated');
}
db.sortedSetsAdd(sets, timestamp, userData.uid, next);

46
src/user/profile.js
View File

@@ -14,7 +14,7 @@ module.exports = function (User) {
User.updateProfile = function (uid, data, callback) {
var fields = ['username', 'email', 'fullname', 'website', 'location',
'groupTitle', 'birthday', 'signature', 'aboutme', 'picture', 'uploadedpicture'];
'groupTitle', 'birthday', 'signature', 'aboutme'];
async.waterfall([
function (next) {
@@ -147,32 +147,34 @@ module.exports = function (User) {
}
function updateEmail(uid, newEmail, callback) {
User.getUserFields(uid, ['email', 'picture', 'uploadedpicture'], function (err, userData) {
if (err) {
return callback(err);
}
async.waterfall([
function (next) {
User.getUserField(uid, 'email', next);
},
function (oldEmail, next) {
oldEmail = oldEmail || '';
userData.email = userData.email || '';
if (userData.email === newEmail) {
return callback();
}
async.series([
async.apply(db.sortedSetRemove, 'email:uid', userData.email.toLowerCase()),
async.apply(db.sortedSetRemove, 'email:sorted', userData.email.toLowerCase() + ':' + uid)
], function (err) {
if (err) {
return callback(err);
if (oldEmail === newEmail) {
return callback();
}
async.series([
async.apply(db.sortedSetRemove, 'email:uid', oldEmail.toLowerCase()),
async.apply(db.sortedSetRemove, 'email:sorted', oldEmail.toLowerCase() + ':' + uid)
], function (err) {
next(err);
});
},
function (next) {
async.parallel([
function (next) {
db.sortedSetAdd('email:uid', uid, newEmail.toLowerCase(), next);
},
async.apply(db.sortedSetAdd, 'user:' + uid + ':emails', Date.now(), newEmail + ':' + Date.now()),
function (next) {
db.sortedSetAdd('email:sorted', 0, newEmail.toLowerCase() + ':' + uid, next);
},
function (next) {
db.sortedSetAdd('user:' + uid + ':emails', Date.now(), newEmail + ':' + Date.now(), next);
},
function (next) {
User.setUserField(uid, 'email', newEmail, next);
},
@@ -185,9 +187,11 @@ module.exports = function (User) {
function (next) {
db.sortedSetAdd('users:notvalidated', Date.now(), uid, next);
}
], callback);
});
});
], function (err) {
next(err);
});
}
], callback);
}
function updateUsername(uid, newUsername, callback) {