From 2148f6ff95577e27d55ab25c1c37fe686b6ae3d0 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Wed, 27 Nov 2013 15:02:09 -0500 Subject: [PATCH] closes #559 --- src/categories.js | 10 +++++----- src/plugins.js | 13 +++++++++---- src/topics.js | 14 +++++++------- src/user.js | 4 ++-- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/categories.js b/src/categories.js index 1a5eac3022..50c659c980 100644 --- a/src/categories.js +++ b/src/categories.js @@ -149,7 +149,7 @@ var RDB = require('./redis.js'), if(cids && cids.length === 0) { return callback(null, {categories : []}); } - + Categories.getCategories(cids, current_user, callback); }); }; @@ -322,12 +322,12 @@ var RDB = require('./redis.js'), RDB.hmgetObject('category:' + cid, fields, callback); }; - Categories.setCategoryField = function(cid, field, value) { - RDB.hset('category:' + cid, field, value); + Categories.setCategoryField = function(cid, field, value, callback) { + RDB.hset('category:' + cid, field, value, callback); }; - Categories.incrementCategoryFieldBy = function(cid, field, value) { - RDB.hincrby('category:' + cid, field, value); + Categories.incrementCategoryFieldBy = function(cid, field, value, callback) { + RDB.hincrby('category:' + cid, field, value, callback); }; Categories.getCategories = function(cids, uid, callback) { diff --git a/src/plugins.js b/src/plugins.js index c87b19462a..2a9bc7f9b2 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -202,9 +202,12 @@ var fs = require('fs'), break; case 'action': async.each(hookList, function(hookObj) { - if (hookObj.method) hookObj.method.call(_self.libraries[hookObj.id], args); - else { - if (global.env === 'development') winston.info('[plugins] Expected method \'' + hookObj.method + '\' in plugin \'' + hookObj.id + '\' not found, skipping.'); + if (hookObj.method) { + hookObj.method.call(_self.libraries[hookObj.id], args); + } else { + if (global.env === 'development') { + winston.info('[plugins] Expected method \'' + hookObj.method + '\' in plugin \'' + hookObj.id + '\' not found, skipping.'); + } } }); break; @@ -215,7 +218,9 @@ var fs = require('fs'), } else { // Otherwise, this hook contains no methods var returnVal = args; - if (callback) callback(null, returnVal); + if (callback) { + callback(null, returnVal); + } } }, isActive: function(id, callback) { diff --git a/src/topics.js b/src/topics.js index 3e026a0747..e9b05928b3 100644 --- a/src/topics.js +++ b/src/topics.js @@ -676,7 +676,7 @@ var RDB = require('./redis.js'), user.notifications.getUnreadByUniqueId(uid, 'topic:' + tid, function(err, nids) { notifications.mark_read_multiple(nids, uid, function() { - + }); }); } @@ -781,16 +781,16 @@ var RDB = require('./redis.js'), RDB.hmgetObject('topic:' + tid, fields, callback); } - Topics.setTopicField = function(tid, field, value) { - RDB.hset('topic:' + tid, field, value); + Topics.setTopicField = function(tid, field, value, callback) { + RDB.hset('topic:' + tid, field, value, callback); } - Topics.increasePostCount = function(tid) { - RDB.hincrby('topic:' + tid, 'postcount', 1); + Topics.increasePostCount = function(tid, callback) { + RDB.hincrby('topic:' + tid, 'postcount', 1, callback); } - Topics.increaseViewCount = function(tid) { - RDB.hincrby('topic:' + tid, 'viewcount', 1); + Topics.increaseViewCount = function(tid, callback) { + RDB.hincrby('topic:' + tid, 'viewcount', 1, callback); } Topics.isLocked = function(tid, callback) { diff --git a/src/user.js b/src/user.js index 78a450c12b..b96bec64e6 100644 --- a/src/user.js +++ b/src/user.js @@ -316,8 +316,8 @@ var bcrypt = require('bcrypt'), RDB.hset('user:' + uid, field, value, callback); }; - User.setUserFields = function(uid, data) { - RDB.hmset('user:' + uid, data); + User.setUserFields = function(uid, data, callback) { + RDB.hmset('user:' + uid, data, callback); }; User.incrementUserFieldBy = function(uid, field, value, callback) {