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

resolve method name collision, getPostsFromSet -> getPostSummariesFromSet

Browse Source
This commit is contained in:
barisusakli
2015-05-11 15:43:57 -04:00
parent d11bfab275
commit dce9a19882
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/accounts.js
View File

@@ -155,7 +155,7 @@ accountsController.getAccount = function(req, res, next) {
user.isFollowing(req.uid, userData.theirid, next); user.isFollowing(req.uid, userData.theirid, next);
}, },
posts: function(next) { posts: function(next) {
posts.getPostsFromSet('uid:' + userData.theirid + ':posts', req.uid, 0, 9, next); posts.getPostSummariesFromSet('uid:' + userData.theirid + ':posts', req.uid, 0, 9, next);
}, },
signature: function(next) { signature: function(next) {
posts.parseSignature(userData, req.uid, next); posts.parseSignature(userData, req.uid, next);
@@ -229,11 +229,11 @@ function getFollow(tpl, name, req, res, next) {
} }
accountsController.getFavourites = function(req, res, next) { accountsController.getFavourites = function(req, res, next) {
getFromUserSet('account/favourites', 'favourites', posts.getPostsFromSet, 'posts', req, res, next); getFromUserSet('account/favourites', 'favourites', posts.getPostSummariesFromSet, 'posts', req, res, next);
}; };
accountsController.getPosts = function(req, res, next) { accountsController.getPosts = function(req, res, next) {
getFromUserSet('account/posts', 'posts', posts.getPostsFromSet, 'posts', req, res, next); getFromUserSet('account/posts', 'posts', posts.getPostSummariesFromSet, 'posts', req, res, next);
}; };
accountsController.getWatchedTopics = function(req, res, next) { accountsController.getWatchedTopics = function(req, res, next) {

2
src/posts.js
View File

@@ -73,7 +73,7 @@ var async = require('async'),
], callback); ], callback);
}; };
Posts.getPostsFromSet = function(set, uid, start, stop, callback) { Posts.getPostSummariesFromSet = function(set, uid, start, stop, callback) {
async.waterfall([ async.waterfall([
function(next) { function(next) {
db.getSortedSetRevRange(set, start, stop, next); db.getSortedSetRevRange(set, start, stop, next);

2
src/socket.io/posts.js
View File

@@ -538,7 +538,7 @@ function loadMorePosts(set, uid, data, callback) {
var start = Math.max(0, parseInt(data.after, 10)), var start = Math.max(0, parseInt(data.after, 10)),
stop = start + 9; stop = start + 9;
posts.getPostsFromSet(set, uid, start, stop, callback); posts.getPostSummariesFromSet(set, uid, start, stop, callback);
} }
SocketPosts.getRecentPosts = function(socket, data, callback) { SocketPosts.getRecentPosts = function(socket, data, callback) {