Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 19:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

topics.getTopics doesnt take set param

Browse Source
This commit is contained in:
barisusakli
2014-11-16 01:33:11 -05:00
parent 79265b9e83
commit 653850661e
7 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts.js
View File

@@ -281,7 +281,7 @@ accountsController.getTopics = function(req, res, next) {
}
var set = 'uid:' + userData.uid + ':topics';
topics.getTopicsFromSet(callerUID, set, 0, 19, function(err, userTopics) {
topics.getTopicsFromSet(set, callerUID, 0, 19, function(err, userTopics) {
if(err) {
return next(err);
}

3
src/controllers/tags.js
View File

@@ -11,6 +11,7 @@ tagsController.getTag = function(req, res, next) {
var tag = validator.escape(req.params.tag);
var uid = req.user ? req.user.uid : 0;
var end = (parseInt(meta.config.topicsPerList, 10) || 20) - 1;
topics.getTagTids(tag, 0, end, function(err, tids) {
if (err) {
return next(err);
@@ -21,7 +22,7 @@ tagsController.getTag = function(req, res, next) {
return res.render('tag', {topics: [], tag: tag});
}
topics.getTopics('tag:' + tag + ':topics', uid, tids, function(err, data) {
topics.getTopics(tids, uid, function(err, data) {
if (err) {
return next(err);
}

2
src/routes/feeds.js
View File

@@ -146,7 +146,7 @@ function disabledRSS(req, res, next) {
function generateForTopics(options, set, req, res, next) {
var uid = req.user ? req.user.uid : 0;
topics.getTopicsFromSet(uid, set, 0, 19, function (err, data) {
topics.getTopicsFromSet(set, uid, 0, 19, function (err, data) {
if (err) {
return next(err);
}

4
src/socket.io/topics.js
View File

@@ -485,7 +485,7 @@ SocketTopics.loadMoreFromSet = function(socket, data, callback) {
var start = parseInt(data.after, 10),
end = start + 9;
topics.getTopicsFromSet(socket.uid, data.set, start, end, callback);
topics.getTopicsFromSet(data.set, socket.uid, start, end, callback);
};
SocketTopics.loadTopics = function(socket, data, callback) {
@@ -493,7 +493,7 @@ SocketTopics.loadTopics = function(socket, data, callback) {
return callback(new Error('[[error:invalid-data]]'));
}
topics.getTopicsFromSet(socket.uid, data.set, data.start, data.end, callback);
topics.getTopicsFromSet(data.set, socket.uid, data.start, data.end, callback);
};
SocketTopics.getPageCount = function(socket, tid, callback) {

6
src/topics.js
View File

@@ -107,7 +107,7 @@ var async = require('async'),
});
};
Topics.getTopics = function(set, uid, tids, callback) {
Topics.getTopics = function(tids, uid, callback) {
var returnTopics = {
topics: [],
nextStart: 0
@@ -129,13 +129,13 @@ var async = require('async'),
});
};
Topics.getTopicsFromSet = function(uid, set, start, end, callback) {
Topics.getTopicsFromSet = function(set, uid, start, end, callback) {
db.getSortedSetRevRange(set, start, end, function(err, tids) {
if (err) {
return callback(err);
}
Topics.getTopics(set, uid, tids, function(err, data) {
Topics.getTopics(tids, uid, function(err, data) {
if (err) {
return callback(err);
}

2
src/topics/popular.js
View File

@@ -33,7 +33,7 @@ module.exports = function(Topics) {
};
function getAllTimePopular(uid, count, callback) {
Topics.getTopicsFromSet(uid, 'topics:posts', 0, count - 1, function(err, data) {
Topics.getTopicsFromSet('topics:posts', uid, 0, count - 1, function(err, data) {
callback(err, data ? data.topics : null);
});
}

15
src/topics/recent.js
View File

@@ -16,18 +16,7 @@ module.exports = function(Topics) {
};
Topics.getRecentTopics = function(uid, start, end, callback) {
async.waterfall([
function(next) {
db.getSortedSetRevRange('topics:recent', start, end, next);
},
function(tids, next) {
Topics.getTopics('topics:recent', uid, tids, next);
},
function(data, next) {
data.nextStart = end + 1;
next(null, data);
}
], callback);
Topics.getTopicsFromSet('topics:recent', uid, start, end, callback);
};
Topics.getLatestTopics = function(uid, start, end, term, callback) {
@@ -36,7 +25,7 @@ module.exports = function(Topics) {
return callback(err);
}
Topics.getTopics('topics:recent', uid, tids, function(err, data) {
Topics.getTopics(tids, uid, function(err, data) {
if (err) {
return callback(err);
}