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

fixed the redis error when going to unread/recent if nextStart is missing

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-22 00:49:32 -05:00
parent f4d23fe5df
commit bae76ebd70
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/topics.js
View File

@@ -445,7 +445,8 @@ var async = require('async'),
function getTopics(set, uid, tids, callback) {
var returnTopics = {
'topics': []
topics: [],
nextStart: 0
};
if (!tids || !tids.length) {
@@ -571,17 +572,13 @@ var async = require('async'),
};
Topics.getUnreadTopics = function(uid, start, stop, callback) {
var unreadTopics = {
'show_markallread_button': 'show',
'no_topics_message': 'hidden',
'topics': []
};
function noUnreadTopics() {
unreadTopics.no_topics_message = '';
unreadTopics.show_markallread_button = 'hidden';
callback(null, unreadTopics);
}
var unreadTopics = {
no_topics_message: '',
show_markallread_button: 'hidden',
nextStart : 0,
topics: []
};
function sendUnreadTopics(topicIds) {
@@ -597,13 +594,8 @@ var async = require('async'),
unreadTopics.topics = topicData;
unreadTopics.nextStart = parseInt(rank, 10) + 1;
if (!topicData || topicData.length === 0) {
unreadTopics.no_topics_message = '';
}
if (uid === 0 || topicData.length === 0) {
unreadTopics.show_markallread_button = 'hidden';
}
unreadTopics.no_topics_message = (!topicData || topicData.length === 0) ? '' : 'hidden';
unreadTopics.show_markallread_button = topicData.length === 0 ? 'hidden' : '';
callback(null, unreadTopics);
});
@@ -618,7 +610,7 @@ var async = require('async'),
if (unreadTids.length) {
sendUnreadTopics(unreadTids);
} else {
noUnreadTopics();
callback(null, unreadTopics);
}
});
};