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

tons more changes

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-12-02 19:40:11 -05:00
parent e32d230974
commit 3775c8e50a
5 changed files with 288 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
src/user.js
View File

@@ -13,7 +13,7 @@ var bcrypt = require('bcrypt'),
db = require('./database'),
meta = require('./meta'),
emailjsServer = emailjs.server.connect(meta.config['email:smtp:host'] || '127.0.0.1'),
Groups = require('./groups'),
groups = require('./groups'),
notifications = require('./notifications'),
topics = require('./topics');
@@ -287,7 +287,7 @@ var bcrypt = require('bcrypt'),
};
User.isEmailAvailable = function(email, callback) {
RDB.hexists('email:uid', email, function(err, exists) {
db.isObjectField('email:uid', email, function(err, exists) {
callback(err, !exists);
});
};
@@ -321,25 +321,25 @@ var bcrypt = require('bcrypt'),
};
User.setUserField = function(uid, field, value, callback) {
RDB.hset('user:' + uid, field, value, callback);
db.setObjectField('user:' + uid, field, value, callback);
};
User.setUserFields = function(uid, data, callback) {
RDB.hmset('user:' + uid, data, callback);
db.setObject('user:' + uid, data, callback);
};
User.incrementUserFieldBy = function(uid, field, value, callback) {
RDB.hincrby('user:' + uid, field, value, callback);
db.incrObjectFieldBy('user:' + uid, field, value, callback);
};
User.decrementUserFieldBy = function(uid, field, value, callback) {
RDB.hincrby('user:' + uid, field, -value, callback);
db.incrObjectFieldBy('user:' + uid, field, -value, callback);
};
User.getUsers = function(set, start, stop, callback) {
var data = [];
RDB.zrevrange(set, start, stop, function(err, uids) {
db.getSortedSetRevRange(set, start, stop, function(err, uids) {
if (err) {
return callback(err, null);
}
@@ -360,7 +360,6 @@ var bcrypt = require('bcrypt'),
callback(err, data);
});
});
};
User.createGravatarURLFromEmail = function(email) {
@@ -433,7 +432,7 @@ var bcrypt = require('bcrypt'),
User.addPostIdToUser(uid, pid);
User.incrementUserFieldBy(uid, 'postcount', 1, function(err, newpostcount) {
RDB.zadd('users:postcount', newpostcount, uid);
db.sortedSetAdd('users:postcount', newpostcount, uid);
});
User.setUserField(uid, 'lastposttime', timestamp);
@@ -442,15 +441,15 @@ var bcrypt = require('bcrypt'),
};
User.addPostIdToUser = function(uid, pid) {
RDB.lpush('uid:' + uid + ':posts', pid);
db.listPrepend('uid:' + uid + ':posts', pid);
};
User.addTopicIdToUser = function(uid, tid) {
RDB.lpush('uid:' + uid + ':topics', tid);
db.listPrepend('uid:' + uid + ':topics', tid);
};
User.getPostIds = function(uid, start, end, callback) {
RDB.lrange('uid:' + uid + ':posts', start, end, function(err, pids) {
User.getPostIds = function(uid, start, stop, callback) {
db.getListRange('uid:' + uid + ':posts', start, stop, function(err, pids) {
if (!err) {
if (pids && pids.length) {
callback(pids);
@@ -464,51 +463,12 @@ var bcrypt = require('bcrypt'),
});
};
User.sendConfirmationEmail = function(email) {
if (meta.config['email:smtp:host'] && meta.config['email:smtp:port'] && meta.config['email:from']) {
var confirm_code = utils.generateUUID(),
confirm_link = nconf.get('url') + 'confirm/' + confirm_code,
confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({
'CONFIRM_LINK': confirm_link
}) + global.templates['emails/footer'],
confirm_email_plaintext = global.templates['emails/email_confirm_plaintext'].parse({
'CONFIRM_LINK': confirm_link
});
// Email confirmation code
var expiry_time = 60 * 60 * 2, // Expire after 2 hours
email_key = 'email:' + email + ':confirm',
confirm_key = 'confirm:' + confirm_code + ':email';
RDB.set(email_key, confirm_code);
RDB.expire(email_key, expiry_time);
RDB.set(confirm_key, email);
RDB.expire(confirm_key, expiry_time);
// Send intro email w/ confirm code
var message = emailjs.message.create({
text: confirm_email_plaintext,
from: meta.config['email:from'] || 'localhost@example.org',
to: email,
subject: '[NodeBB] Registration Email Verification',
attachment: [{
data: confirm_email,
alternative: true
}]
});
emailjsServer.send(message, function(err, success) {
if (err) {
console.log(err);
}
});
}
};
User.follow = function(uid, followid, callback) {
RDB.sadd('following:' + uid, followid, function(err, data) {
db.setAdd('following:' + uid, followid, function(err, data) {
if (!err) {
RDB.sadd('followers:' + followid, uid, function(err, data) {
db.setAdd('followers:' + followid, uid, function(err, data) {
if (!err) {
callback(true);
} else {
@@ -524,7 +484,7 @@ var bcrypt = require('bcrypt'),
};
User.unfollow = function(uid, unfollowid, callback) {
RDB.srem('following:' + uid, unfollowid, function(err, data) {
db.setRemove('following:' + uid, unfollowid, function(err, data) {
if (!err) {
RDB.srem('followers:' + unfollowid, uid, function(err, data) {
callback(data);
@@ -536,7 +496,7 @@ var bcrypt = require('bcrypt'),
};
User.getFollowing = function(uid, callback) {
RDB.smembers('following:' + uid, function(err, userIds) {
db.getSetMembers('following:' + uid, function(err, userIds) {
if (!err) {
User.getDataForUsers(userIds, callback);
} else {
@@ -546,7 +506,7 @@ var bcrypt = require('bcrypt'),
};
User.getFollowers = function(uid, callback) {
RDB.smembers('followers:' + uid, function(err, userIds) {
db.getSetMembers('followers:' + uid, function(err, userIds) {
if (!err) {
User.getDataForUsers(userIds, callback);
} else {
@@ -556,7 +516,7 @@ var bcrypt = require('bcrypt'),
};
User.getFollowingCount = function(uid, callback) {
RDB.smembers('following:' + uid, function(err, userIds) {
db.getSetMembers('following:' + uid, function(err, userIds) {
if (err) {
console.log(err);
} else {
@@ -569,7 +529,7 @@ var bcrypt = require('bcrypt'),
};
User.getFollowerCount = function(uid, callback) {
RDB.smembers('followers:' + uid, function(err, userIds) {
db.getSetMembers('followers:' + uid, function(err, userIds) {
if(err) {
console.log(err);
} else {
@@ -608,7 +568,7 @@ var bcrypt = require('bcrypt'),
User.sendPostNotificationToFollowers = function(uid, tid, pid) {
User.getUserField(uid, 'username', function(err, username) {
RDB.smembers('followers:' + uid, function(err, followers) {
db.getSetMembers('followers:' + uid, function(err, followers) {
topics.getTopicField(tid, 'slug', function(err, slug) {
var message = '<strong>' + username + '</strong> made a new post';
@@ -621,7 +581,7 @@ var bcrypt = require('bcrypt'),
};
User.isFollowing = function(uid, theirid, callback) {
RDB.sismember('following:' + uid, theirid, function(err, data) {
db.isSetMember('following:' + uid, theirid, function(err, data) {
if (!err) {
callback(data === 1);
} else {
@@ -637,8 +597,10 @@ var bcrypt = require('bcrypt'),
};
User.count = function(socket) {
RDB.get('usercount', function(err, count) {
RDB.handle(err);
db.getObjectField('global', 'usercount', function(err, count) {
if(err) {
return;
}
socket.emit('user.count', {
count: count ? count : 0
@@ -647,11 +609,11 @@ var bcrypt = require('bcrypt'),
};
User.getUidByUsername = function(username, callback) {
RDB.hget('username:uid', username, callback);
db.getObjectField('username:uid', username, callback);
};
User.getUidByUserslug = function(userslug, callback) {
RDB.hget('userslug:uid', userslug, callback);
db.getObjectField('userslug:uid', userslug, callback);
};
User.getUsernamesByUids = function(uids, callback) {
@@ -693,51 +655,53 @@ var bcrypt = require('bcrypt'),
};
User.getUidByEmail = function(email, callback) {
RDB.hget('email:uid', email, function(err, data) {
db.getObjectField('email:uid', email, function(err, data) {
if (err) {
RDB.handle(err);
return callback(err);
}
callback(data);
callback(null, data);
});
};
User.getUidByTwitterId = function(twid, callback) {
RDB.hget('twid:uid', twid, function(err, uid) {
db.getObjectField('twid:uid', twid, function(err, uid) {
if (err) {
RDB.handle(err);
return callback(err);
}
callback(uid);
callback(null, uid);
});
};
User.getUidByGoogleId = function(gplusid, callback) {
RDB.hget('gplusid:uid', gplusid, function(err, uid) {
db.getObjectField('gplusid:uid', gplusid, function(err, uid) {
if (err) {
RDB.handle(err);
return callback(err);
}
callback(uid);
callback(null, uid);
});
};
User.getUidByFbid = function(fbid, callback) {
RDB.hget('fbid:uid', fbid, function(err, uid) {
db.getObjectField('fbid:uid', fbid, function(err, uid) {
if (err) {
RDB.handle(err);
return callback(err);
}
callback(uid);
callback(null, uid);
});
};
User.isModerator = function(uid, cid, callback) {
RDB.sismember('cid:' + cid + ':moderators', uid, function(err, exists) {
RDB.handle(err);
db.isSetMember('cid:' + cid + ':moderators', uid, function(err, exists) {
if(err) {
return calback(err);
}
callback(err, !! exists);
});
};
User.isAdministrator = function(uid, callback) {
Groups.getGidFromName('Administrators', function(err, gid) {
Groups.isMember(uid, gid, function(err, isAdmin) {
groups.getGidFromName('Administrators', function(err, gid) {
groups.isMember(uid, gid, function(err, isAdmin) {
callback(err, !! isAdmin);
});
});
@@ -750,15 +714,15 @@ var bcrypt = require('bcrypt'),
callback = null;
}
RDB.hget('reset:uid', code, function(err, uid) {
db.getObjectField('reset:uid', code, function(err, uid) {
if (err) {
RDB.handle(err);
return callback(false);
}
if (uid !== null) {
RDB.hget('reset:expiry', code, function(err, expiry) {
db.getObjectField('reset:expiry', code, function(err, expiry) {
if (err) {
RDB.handle(err);
return callback(false);
}
if (expiry >= +Date.now() / 1000 | 0) {
@@ -771,8 +735,8 @@ var bcrypt = require('bcrypt'),
}
} else {
// Expired, delete from db
RDB.hdel('reset:uid', code);
RDB.hdel('reset:expiry', code);
db.deleteObjectField('reset:uid', code);
db.deleteObjectField('reset:expiry', code);
if (!callback) {
socket.emit('user:reset.valid', {
valid: false
@@ -794,12 +758,12 @@ var bcrypt = require('bcrypt'),
});
},
send: function(socket, email) {
User.getUidByEmail(email, function(uid) {
User.getUidByEmail(email, function(err, uid) {
if (uid !== null) {
// Generate a new reset code
var reset_code = utils.generateUUID();
RDB.hset('reset:uid', reset_code, uid);
RDB.hset('reset:expiry', reset_code, (60 * 60) + new Date() / 1000 | 0); // Active for one hour
db.setObjectField('reset:uid', reset_code, uid);
db.setobjectField('reset:expiry', reset_code, (60 * 60) + new Date() / 1000 | 0); // Active for one hour
var reset_link = nconf.get('url') + 'reset/' + reset_code,
reset_email = global.templates['emails/reset'].parse({
@@ -847,17 +811,17 @@ var bcrypt = require('bcrypt'),
commit: function(socket, code, password) {
this.validate(socket, code, function(validated) {
if (validated) {
RDB.hget('reset:uid', code, function(err, uid) {
db.getObjectField('reset:uid', code, function(err, uid) {
if (err) {
RDB.handle(err);
return;
}
User.hashPassword(password, function(err, hash) {
User.setUserField(uid, 'password', hash);
});
RDB.hdel('reset:uid', code);
RDB.hdel('reset:expiry', code);
db.deleteObjectField('reset:uid', code);
db.deleteObjectField('reset:expiry', code);
socket.emit('user:reset.commit', {
status: 'ok'
@@ -868,9 +832,48 @@ var bcrypt = require('bcrypt'),
}
};
User.sendConfirmationEmail = function(email) {
if (meta.config['email:smtp:host'] && meta.config['email:smtp:port'] && meta.config['email:from']) {
var confirm_code = utils.generateUUID(),
confirm_link = nconf.get('url') + 'confirm/' + confirm_code,
confirm_email = global.templates['emails/header'] + global.templates['emails/email_confirm'].parse({
'CONFIRM_LINK': confirm_link
}) + global.templates['emails/footer'],
confirm_email_plaintext = global.templates['emails/email_confirm_plaintext'].parse({
'CONFIRM_LINK': confirm_link
});
// Email confirmation code
var expiry_time = Date.now() / 1000 + 60 * 60 * 2;
db.setObjectField('email:confirm', email, confirm_code);
db.setObjectField('confirm:email', confirm_code, email);
db.setObjectField('confirm:email', confirm_code + ':expire', expiry_time);
// Send intro email w/ confirm code
var message = emailjs.message.create({
text: confirm_email_plaintext,
from: meta.config['email:from'] || 'localhost@example.org',
to: email,
subject: '[NodeBB] Registration Email Verification',
attachment: [{
data: confirm_email,
alternative: true
}]
});
emailjsServer.send(message, function(err, success) {
if (err) {
console.log(err);
}
});
}
};
User.email = {
exists: function(socket, email, callback) {
User.getUidByEmail(email, function(exists) {
User.getUidByEmail(email, function(err, exists) {
exists = !! exists;
if (typeof callback !== 'function') {
socket.emit('user.email.exists', {
@@ -882,14 +885,30 @@ var bcrypt = require('bcrypt'),
});
},
confirm: function(code, callback) {
RDB.get('confirm:' + code + ':email', function(err, email) {
db.getObjectFields('confirm:email', [code, code + ':expire'], function(err, data) {
if (err) {
RDB.handle(err);
return callback({
status:'error'
});
}
var email = data.email;
var expiry = data[code + ':expire'];
if (parseInt(expiry, 10) >= Date.now() / 1000) {
db.deleteObjectField('confirm:email', code);
db.deleteObjectField('confirm:email', code + ':expire');
return callback({
status: 'expired'
});
}
if (email !== null) {
RDB.set('email:' + email + ':confirm', true);
RDB.del('confirm:' + code + ':email');
db.setObjectField('email:confirm', email, true);
db.deleteObjectField('confirm:email', code);
db.deleteObjectField('confirm:email', code + ':expire');
callback({
status: 'ok'
});
@@ -908,7 +927,7 @@ var bcrypt = require('bcrypt'),
async.parallel({
unread: function(next) {
RDB.zrevrange('uid:' + uid + ':notifications:unread', 0, 10, function(err, nids) {
db.getSortedSetRevRange('uid:' + uid + ':notifications:unread', 0, 10, function(err, nids) {
// @todo handle err
var unread = [];
@@ -924,7 +943,7 @@ var bcrypt = require('bcrypt'),
if (notif_data) {
unread.push(notif_data);
} else {
RDB.zrem('uid:' + uid + ':notifications:unread', nid);
db.sortedSetRemove('uid:' + uid + ':notifications:unread', nid);
}
next();
@@ -938,7 +957,7 @@ var bcrypt = require('bcrypt'),
});
},
read: function(next) {
RDB.zrevrange('uid:' + uid + ':notifications:read', 0, 10, function(err, nids) {
db.getSortedSetRevRange('uid:' + uid + ':notifications:read', 0, 10, function(err, nids) {
// @todo handle err
var read = [];
@@ -954,7 +973,7 @@ var bcrypt = require('bcrypt'),
if (notif_data) {
read.push(notif_data);
} else {
RDB.zrem('uid:' + uid + ':notifications:read', nid);
db.sortedSetRemove('uid:' + uid + ':notifications:read', nid);
}
next();
@@ -986,6 +1005,7 @@ var bcrypt = require('bcrypt'),
before = new Date(parseInt(before, 10));
}
// TODO : figure out how to do this with dbal
RDB.multi()
.zrevrangebyscore('uid:' + uid + ':notifications:read', before ? before.getTime(): now.getTime(), -Infinity, 'LIMIT', 0, limit)
.zrevrangebyscore('uid:' + uid + ':notifications:unread', before ? before.getTime(): now.getTime(), -Infinity, 'LIMIT', 0, limit)
@@ -1014,10 +1034,10 @@ var bcrypt = require('bcrypt'),
});
},
getUnreadCount: function(uid, callback) {
RDB.zcount('uid:' + uid + ':notifications:unread', 0, 10, callback);
db.sortedSetCount('uid:' + uid + ':notifications:unread', 0, 10, callback);
},
getUnreadByUniqueId: function(uid, uniqueId, callback) {
RDB.zrange('uid:' + uid + ':notifications:unread', 0, -1, function(err, nids) {
db.getSortedSetRange('uid:' + uid + ':notifications:unread', 0, -1, function(err, nids) {
async.filter(nids, function(nid, next) {
notifications.get(nid, uid, function(notifObj) {
if (notifObj.uniqueId === uniqueId) {