hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring posts, topics, and categories so that each "get" is moved up

Browse Source 
one level. Topics.get will get all of the posts in a tid, etc.
v1.18.x
Julian Lam 12 years ago
parent 907f5d4ea6
commit 26781157b3
7 changed files with 307 additions and 304 deletions
Show Stats Download Patch File Download Diff File

2
app.js
Unescape Escape View File

@ -24,7 +24,7 @@ global.templates = {};
//setup scripts to be moved outside of the app in future.
function setup_categories() {
console.log('Checking categories...');
categories.get(function(data) {
categories.getAllCategories(function(data) {
if (data.categories.length === 0) {
console.log('Setting up default categories...');

163
src/categories.js
Unescape Escape View File

@ -2,7 +2,8 @@ var RDB = require('./redis.js'),
posts = require('./posts.js'),
utils = require('./utils.js'),
user = require('./user.js'),
async = require('async');
async = require('async'),
topics = require('./topics.js');
(function(Categories) {
@ -56,7 +57,165 @@ var RDB = require('./redis.js'),
// just a reminder to self that name + slugs are stored into topics data as well.
};
Categories.get = function(callback, current_user) {
Categories.get = function(callback, category_id, current_user, start, end) {
if (start == null) start = 0;
if (end == null) end = start + 10;
//build a proper wrapper for this and move it into above function later
var range_var = (category_id) ? 'categories:' + category_id + ':tid' : 'topics:tid';
RDB.smembers(range_var, function(err, tids) {
var title = [],
uid = [],
timestamp = [],
slug = [],
postcount = [],
locked = [],
deleted = [],
pinned = [];
for (var i=0, ii=tids.length; i<ii; i++) {
title.push('tid:' + tids[i] + ':title');
uid.push('tid:' + tids[i] + ':uid');
timestamp.push('tid:' + tids[i] + ':timestamp');
slug.push('tid:' + tids[i] + ':slug');
postcount.push('tid:' + tids[i] + ':postcount');
locked.push('tid:' + tids[i] + ':locked');
deleted.push('tid:' + tids[i] + ':deleted');
pinned.push('tid:' + tids[i] + ':pinned');
}
var multi = RDB.multi()
.get('cid:' + category_id + ':name')
.smembers('cid:' + category_id + ':active_users');
if (tids.length > 0) {
multi
.mget(title)
.mget(uid)
.mget(timestamp)
.mget(slug)
.mget(postcount)
.mget(locked)
.mget(deleted)
.mget(pinned)
}
multi.exec(function(err, replies) {
category_name = replies[0];
if(category_id && category_name === null) {
callback(false);
return;
}
active_usernames = replies[1];
var retrieved_topics = [];
if (tids.length == 0) {
callback({
'category_name' : category_id ? category_name : 'Recent',
'show_topic_button' : category_id ? 'show' : 'hidden',
'category_id': category_id || 0,
'topics' : []
});
}
title = replies[2];
uid = replies[3];
timestamp = replies[4];
slug = replies[5];
postcount = replies[6];
locked = replies[7];
deleted = replies[8];
pinned = replies[9];
var usernames,
has_read,
moderators,
teaser_info,
privileges;
function generate_topic() {
if (!usernames || !has_read || !moderators || !teaser_info || !privileges) return;
if (tids.length > 0) {
for (var i=0, ii=title.length; i<ii; i++) {
if (!deleted[i] || (deleted[i] && privileges.view_deleted) || uid[i] === current_user) {
retrieved_topics.push({
'title' : title[i],
'uid' : uid[i],
'username': usernames[i],
'timestamp' : timestamp[i],
'relativeTime': utils.relativeTime(timestamp[i]),
'slug' : slug[i],
'post_count' : postcount[i],
'lock-icon': locked[i] === '1' ? 'icon-lock' : 'none',
'deleted': deleted[i],
'deleted-class': deleted[i] ? 'deleted' : '',
'pinned': parseInt(pinned[i] || 0), // For sorting purposes
'pin-icon': pinned[i] === '1' ? 'icon-pushpin' : 'none',
'badgeclass' : (has_read[i] && current_user !=0) ? '' : 'badge-important',
'teaser_text': teaser_info[i].text,
'teaser_username': teaser_info[i].username
});
}
}
}
// Float pinned topics to the top
retrieved_topics = retrieved_topics.sort(function(a, b) {
if (a.pinned !== b.pinned) return b.pinned - a.pinned;
else {
// Sort by datetime descending
return b.timestamp - a.timestamp;
}
});
var active_users = [];
for (var username in active_usernames) {
active_users.push({'username': active_usernames[username]});
}
callback({
'category_name' : category_id ? category_name : 'Recent',
'show_topic_button' : category_id ? 'show' : 'hidden',
'category_id': category_id || 0,
'topics': retrieved_topics,
'active_users': active_users,
'moderator_block_class': moderators.length > 0 ? '' : 'none',
'moderators': moderators
});
}
user.get_usernames_by_uids(uid, function(userNames) {
usernames = userNames;
generate_topic();
});
topics.hasReadTopics(tids, current_user, function(hasRead) {
has_read = hasRead;
generate_topic();
});
Categories.getModerators(category_id, function(mods) {
moderators = mods;
generate_topic();
});
topics.get_teasers(tids, function(teasers) {
teaser_info = teasers;
generate_topic();
});
Categories.privileges(category_id, current_user, function(user_privs) {
privileges = user_privs;
});
});
});
}
Categories.getAllCategories = function(callback, current_user) {
RDB.lrange('categories:cid', 0, -1, function(err, cids) {
RDB.handle(err);
Categories.get_category(cids, callback, current_user);

149
src/posts.js
Unescape Escape View File

@ -12,153 +12,8 @@ marked.setOptions({
(function(Posts) {
Posts.get = function(callback, tid, current_user, start, end) {
if (start == null) start = 0;
if (end == null) end = -1;//start + 10;
var post_data, user_data, thread_data, vote_data, privileges;
getTopicPosts();
getPrivileges();
//compile thread after all data is asynchronously called
function generateThread() {
if (!post_data || !user_data || !thread_data || !vote_data || !privileges) return;
var posts = [],
main_posts = [];
for (var i=0, ii= post_data.pid.length; i<ii; i++) {
var uid = post_data.uid[i],
pid = post_data.pid[i];
if (post_data.deleted[i] === null || (post_data.deleted[i] === '1' && privileges.view_deleted) || current_user === uid) {
var post_obj = {
'pid' : pid,
'uid' : uid,
'content' : marked(post_data.content[i] || ''),
'post_rep' : post_data.reputation[i] || 0,
'timestamp' : post_data.timestamp[i],
'relativeTime': utils.relativeTime(post_data.timestamp[i]),
'username' : user_data[uid].username || 'anonymous',
'user_rep' : user_data[uid].reputation || 0,
'gravatar' : user_data[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e',
'signature' : marked(utils.strip_tags(user_data[uid].signature || '')),
'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty',
'display_moderator_tools': (uid == current_user || privileges.editable) ? 'show' : 'none',
'edited-class': post_data.editor[i] !== null ? '' : 'none',
'editor': post_data.editor[i] !== null ? user_data[post_data.editor[i]].username : '',
'relativeEditTime': post_data.editTime !== null ? utils.relativeTime(post_data.editTime[i]) : '',
'deleted': post_data.deleted[i] || '0'
};
if (i == 0) main_posts.push(post_obj);
else posts.push(post_obj);
}
}
callback({
'topic_name':thread_data.topic_name,
'category_name':thread_data.category_name,
'category_slug':thread_data.category_slug,
'locked': parseInt(thread_data.locked) || 0,
'deleted': parseInt(thread_data.deleted) || 0,
'pinned': parseInt(thread_data.pinned) || 0,
'topic_id': tid,
'expose_tools': privileges.editable ? 1 : 0,
'posts': posts,
'main_posts': main_posts
});
}
function getTopicPosts() {
// get all data for thread in asynchronous fashion
RDB.lrange('tid:' + tid + ':posts', start, end, function(err, pids) {
RDB.handle(err);
if(pids.length === 0 ){
callback(false);
return;
}
topics.markAsRead(tid, current_user);
var content = [], uid = [], timestamp = [], pid = [], post_rep = [], editor = [], editTime = [], deleted = [];
for (var i=0, ii=pids.length; i<ii; i++) {
content.push('pid:' + pids[i] + ':content');
uid.push('pid:' + pids[i] + ':uid');
timestamp.push('pid:' + pids[i] + ':timestamp');
post_rep.push('pid:' + pids[i] + ':rep');
editor.push('pid:' + pids[i] + ':editor');
editTime.push('pid:' + pids[i] + ':edited');
deleted.push('pid:' + pids[i] + ':deleted');
pid.push(pids[i]);
}
Posts.getFavouritesByPostIDs(pids, current_user, function(fav_data) {
vote_data = fav_data;
generateThread();
});
RDB.multi()
.mget(content)
.mget(uid)
.mget(timestamp)
.mget(post_rep)
.get('tid:' + tid + ':title')
.get('tid:' + tid + ':locked')
.get('tid:' + tid + ':category_name')
.get('tid:' + tid + ':category_slug')
.get('tid:' + tid + ':deleted')
.get('tid:' + tid + ':pinned')
.mget(editor)
.mget(editTime)
.mget(deleted)
.exec(function(err, replies) {
post_data = {
pid: pids,
content: replies[0],
uid: replies[1],
timestamp: replies[2],
reputation: replies[3],
editor: replies[10],
editTime: replies[11],
deleted: replies[12]
};
thread_data = {
topic_name: replies[4],
locked: replies[5] || 0,
category_name: replies[6],
category_slug: replies[7],
deleted: replies[8] || 0,
pinned: replies[9] || 0
};
// Add any editors to the user_data object
for(var x=0,numPosts=replies[10].length;x<numPosts;x++) {
if (replies[10][x] !== null && post_data.uid.indexOf(replies[10][x]) === -1) {
post_data.uid.push(replies[10][x]);
}
}
user.getMultipleUserFields(post_data.uid, ['username','reputation','picture', 'signature'], function(user_details){
user_data = user_details;
generateThread();
});
});
});
}
function getPrivileges() {
topics.privileges(tid, current_user, function(user_privs) {
privileges = user_privs;
generateThread();
});
}
Posts.get = function(callback, pid, current_user) {
// Not used... although Topics.get could be refactored to call Posts.get for every post
}
Posts.privileges = function(pid, uid, callback) {

4
src/routes/admin.js
Unescape Escape View File

@ -44,13 +44,13 @@ var user = require('./../user.js'),
if (req.params.tab == 'disabled') {
res.send(JSON.stringify({categories: []}));
} else {
categories.get(function(data) {
categories.getAllCategories(function(data) {
res.send(JSON.stringify(data));
});
}
break;
case 'topics' :
topics.get(function(data) {
categories.get(function(data) {
res.send(JSON.stringify(data));
});
break;

273
src/topics.js
Unescape Escape View File

@ -4,6 +4,7 @@ var RDB = require('./redis.js'),
user = require('./user.js'),
config = require('../config.js'),
categories = require('./categories.js'),
posts = require('./posts.js'),
marked = require('marked'),
async = require('async');
@ -18,165 +19,153 @@ marked.setOptions({
}
Topics.get = function(callback, category_id, current_user, start, end) {
Topics.get = function(callback, tid, current_user, start, end) {
if (start == null) start = 0;
if (end == null) end = start + 10;
//build a proper wrapper for this and move it into above function later
var range_var = (category_id) ? 'categories:' + category_id + ':tid' : 'topics:tid';
RDB.smembers(range_var, function(err, tids) {
var title = [],
uid = [],
timestamp = [],
slug = [],
postcount = [],
locked = [],
deleted = [],
pinned = [];
for (var i=0, ii=tids.length; i<ii; i++) {
title.push('tid:' + tids[i] + ':title');
uid.push('tid:' + tids[i] + ':uid');
timestamp.push('tid:' + tids[i] + ':timestamp');
slug.push('tid:' + tids[i] + ':slug');
postcount.push('tid:' + tids[i] + ':postcount');
locked.push('tid:' + tids[i] + ':locked');
deleted.push('tid:' + tids[i] + ':deleted');
pinned.push('tid:' + tids[i] + ':pinned');
}
if (end == null) end = -1;//start + 10;
var multi = RDB.multi()
.get('cid:' + category_id + ':name')
.smembers('cid:' + category_id + ':active_users');
var post_data, user_data, thread_data, vote_data, privileges;
if (tids.length > 0) {
multi
.mget(title)
.mget(uid)
.mget(timestamp)
.mget(slug)
.mget(postcount)
.mget(locked)
.mget(deleted)
.mget(pinned)
getTopicPosts();
getPrivileges();
//compile thread after all data is asynchronously called
function generateThread() {
if (!post_data || !user_data || !thread_data || !vote_data || !privileges) return;
var retrieved_posts = [],
main_posts = [];
for (var i=0, ii= post_data.pid.length; i<ii; i++) {
var uid = post_data.uid[i],
pid = post_data.pid[i];
if (post_data.deleted[i] === null || (post_data.deleted[i] === '1' && privileges.view_deleted) || current_user === uid) {
var post_obj = {
'pid' : pid,
'uid' : uid,
'content' : marked(post_data.content[i] || ''),
'post_rep' : post_data.reputation[i] || 0,
'timestamp' : post_data.timestamp[i],
'relativeTime': utils.relativeTime(post_data.timestamp[i]),
'username' : user_data[uid].username || 'anonymous',
'user_rep' : user_data[uid].reputation || 0,
'gravatar' : user_data[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e',
'signature' : marked(utils.strip_tags(user_data[uid].signature || '')),
'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty',
'display_moderator_tools': (uid == current_user || privileges.editable) ? 'show' : 'none',
'edited-class': post_data.editor[i] !== null ? '' : 'none',
'editor': post_data.editor[i] !== null ? user_data[post_data.editor[i]].username : '',
'relativeEditTime': post_data.editTime !== null ? utils.relativeTime(post_data.editTime[i]) : '',
'deleted': post_data.deleted[i] || '0'
};
if (i == 0) main_posts.push(post_obj);
else retrieved_posts.push(post_obj);
}
}
multi.exec(function(err, replies) {
category_name = replies[0];
if(category_id && category_name === null) {
callback({
'topic_name':thread_data.topic_name,
'category_name':thread_data.category_name,
'category_slug':thread_data.category_slug,
'locked': parseInt(thread_data.locked) || 0,
'deleted': parseInt(thread_data.deleted) || 0,
'pinned': parseInt(thread_data.pinned) || 0,
'topic_id': tid,
'expose_tools': privileges.editable ? 1 : 0,
'posts': retrieved_posts,
'main_posts': main_posts
});
}
function getTopicPosts() {
// get all data for thread in asynchronous fashion
RDB.lrange('tid:' + tid + ':posts', start, end, function(err, pids) {
RDB.handle(err);
if(pids.length === 0 ){
callback(false);
return;
}
active_usernames = replies[1];
var topics = [];
if (tids.length == 0) {
callback({
'category_name' : category_id ? category_name : 'Recent',
'show_topic_button' : category_id ? 'show' : 'hidden',
'category_id': category_id || 0,
'topics' : []
});
Topics.markAsRead(tid, current_user);
var content = [], uid = [], timestamp = [], pid = [], post_rep = [], editor = [], editTime = [], deleted = [];
for (var i=0, ii=pids.length; i<ii; i++) {
content.push('pid:' + pids[i] + ':content');
uid.push('pid:' + pids[i] + ':uid');
timestamp.push('pid:' + pids[i] + ':timestamp');
post_rep.push('pid:' + pids[i] + ':rep');
editor.push('pid:' + pids[i] + ':editor');
editTime.push('pid:' + pids[i] + ':edited');
deleted.push('pid:' + pids[i] + ':deleted');
pid.push(pids[i]);
}
title = replies[2];
uid = replies[3];
timestamp = replies[4];
slug = replies[5];
postcount = replies[6];
locked = replies[7];
deleted = replies[8];
pinned = replies[9];
var usernames,
has_read,
moderators,
teaser_info,
privileges;
function generate_topic() {
if (!usernames || !has_read || !moderators || !teaser_info || !privileges) return;
if (tids.length > 0) {
for (var i=0, ii=title.length; i<ii; i++) {
if (!deleted[i] || (deleted[i] && privileges.view_deleted) || uid[i] === current_user) {
topics.push({
'title' : title[i],
'uid' : uid[i],
'username': usernames[i],
'timestamp' : timestamp[i],
'relativeTime': utils.relativeTime(timestamp[i]),
'slug' : slug[i],
'post_count' : postcount[i],
'lock-icon': locked[i] === '1' ? 'icon-lock' : 'none',
'deleted': deleted[i],
'deleted-class': deleted[i] ? 'deleted' : '',
'pinned': parseInt(pinned[i] || 0), // For sorting purposes
'pin-icon': pinned[i] === '1' ? 'icon-pushpin' : 'none',
'badgeclass' : (has_read[i] && current_user !=0) ? '' : 'badge-important',
'teaser_text': teaser_info[i].text,
'teaser_username': teaser_info[i].username
});
}
}
}
posts.getFavouritesByPostIDs(pids, current_user, function(fav_data) {
vote_data = fav_data;
generateThread();
});
// Float pinned topics to the top
topics = topics.sort(function(a, b) {
if (a.pinned !== b.pinned) return b.pinned - a.pinned;
else {
// Sort by datetime descending
return b.timestamp - a.timestamp;
RDB.multi()
.mget(content)
.mget(uid)
.mget(timestamp)
.mget(post_rep)
.get('tid:' + tid + ':title')
.get('tid:' + tid + ':locked')
.get('tid:' + tid + ':category_name')
.get('tid:' + tid + ':category_slug')
.get('tid:' + tid + ':deleted')
.get('tid:' + tid + ':pinned')
.mget(editor)
.mget(editTime)
.mget(deleted)
.exec(function(err, replies) {
post_data = {
pid: pids,
content: replies[0],
uid: replies[1],
timestamp: replies[2],
reputation: replies[3],
editor: replies[10],
editTime: replies[11],
deleted: replies[12]
};
thread_data = {
topic_name: replies[4],
locked: replies[5] || 0,
category_name: replies[6],
category_slug: replies[7],
deleted: replies[8] || 0,
pinned: replies[9] || 0
};
// Add any editors to the user_data object
for(var x=0,numPosts=replies[10].length;x<numPosts;x++) {
if (replies[10][x] !== null && post_data.uid.indexOf(replies[10][x]) === -1) {
post_data.uid.push(replies[10][x]);
}
}
});
var active_users = [];
for (var username in active_usernames) {
active_users.push({'username': active_usernames[username]});
}
callback({
'category_name' : category_id ? category_name : 'Recent',
'show_topic_button' : category_id ? 'show' : 'hidden',
'category_id': category_id || 0,
'topics': topics,
'active_users': active_users,
'moderator_block_class': moderators.length > 0 ? '' : 'none',
'moderators': moderators
user.getMultipleUserFields(post_data.uid, ['username','reputation','picture', 'signature'], function(user_details){
user_data = user_details;
generateThread();
});
});
}
user.get_usernames_by_uids(uid, function(userNames) {
usernames = userNames;
generate_topic();
});
Topics.hasReadTopics(tids, current_user, function(hasRead) {
has_read = hasRead;
generate_topic();
});
categories.getModerators(category_id, function(mods) {
moderators = mods;
generate_topic();
});
Topics.get_teasers(tids, function(teasers) {
teaser_info = teasers;
generate_topic();
});
});
}
categories.privileges(category_id, current_user, function(user_privs) {
privileges = user_privs;
});
function getPrivileges() {
Topics.privileges(tid, current_user, function(user_privs) {
privileges = user_privs;
generateThread();
});
});
}
}
Topics.privileges = function(tid, uid, callback) {

18
src/webserver.js
Unescape Escape View File

@ -114,7 +114,7 @@ var express = require('express'),
});
break;
case 'home' :
categories.get(function(data) {
categories.getAllCategories(function(data) {
res.send(JSON.stringify(data));
}, (req.user) ? req.user.uid : 0);
break;
@ -163,7 +163,7 @@ var express = require('express'),
res.send(JSON.stringify(data));
break;
case 'topic' :
posts.get(function(data) {
topics.get(function(data) {
if(!data) {
res.send(false);
return;
@ -172,7 +172,7 @@ var express = require('express'),
}, req.params.id, (req.user) ? req.user.uid : 0);
break;
case 'category' :
topics.get(function(data) {
categories.get(function(data) {
if(!data) {
res.send(false);
return;
@ -181,7 +181,7 @@ var express = require('express'),
}, req.params.id, (req.user) ? req.user.uid : 0);
break;
case 'latest' :
topics.get(function(data) {
categories.get(function(data) {
if(!data) {
res.send(false);
return;
@ -190,7 +190,7 @@ var express = require('express'),
});
break;
case 'popular' :
topics.get(function(data) {
categories.get(function(data) {
if(!data) {
res.send(false);
return;
@ -199,7 +199,7 @@ var express = require('express'),
});
break;
case 'active' :
topics.get(function(data) {
categories.get(function(data) {
if(!data) {
res.send(false);
return;
@ -237,9 +237,9 @@ var express = require('express'),
app.get('/api/:method/:id*', api_method);
app.get('/test', function(req, res) {
// topics.get_latest_undeleted_pid(5, function(pid) {
// res.send(pid);
// });
categories.get(function(category) {
res.send(JSON.stringify(category, null, 4));
}, 2, 2, null, null);
});

2
src/websockets.js
Unescape Escape View File

@ -209,7 +209,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
});
socket.on('api:categories.get', function() {
categories.get(function(categories) {
categories.getAllCategories(function(categories) {
socket.emit('api:categories.get', categories);
});
});

Write Preview
Loading…
Cancel
Save