Merge remote-tracking branch 'origin' into posts-refactor

This commit is contained in:
Julian Lam
2013-05-06 10:05:10 -04:00
12 changed files with 367 additions and 246 deletions

View File

@@ -150,8 +150,8 @@ var RDB = require('./redis.js'),
timeout: 2000
});
user.get_user_postdetails([uid], function(user_details) {
user.get_gravatars_by_uids([uid], '', function(gravatars) {
user.get_user_postdetails(uid, function(user_details) {
user.get_gravatars_by_uids(uid, '', function(gravatars) {
var timestamp = new Date().getTime();
socket.in('topic_' + tid).emit('event:new_post', {
@@ -201,7 +201,9 @@ var RDB = require('./redis.js'),
Posts.hasFavourited(pid, uid, function(hasFavourited) {
if (hasFavourited == false) {
RDB.sadd('pid:' + pid + ':users_favourited', uid);
RDB.incr('uid:' + uid_of_poster + ':rep');
RDB.db.hincrby(String(uid_of_poster), 'reputation', 1);
RDB.incr('pid:' + pid + ':rep');
if (room_id) {
@@ -217,7 +219,7 @@ var RDB = require('./redis.js'),
Posts.hasFavourited(pid, uid, function(hasFavourited) {
if (hasFavourited == true) {
RDB.srem('pid:' + pid + ':users_favourited', uid);
RDB.decr('uid:' + uid_of_poster + ':rep');
RDB.db.hincrby(String(uid_of_poster), 'reputation', -1);
RDB.decr('pid:' + pid + ':rep');
if (room_id) {