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

Merge pull request #984 from miksago/reorg-feed-routes

Browse Source 
Move feed routing and logic to src/routes/feeds.js
v1.18.x
Barış Soner Uşaklı 11 years ago
parent 6ab5f42ef0 33607e0cd9
commit 8fad323d80
2 changed files with 75 additions and 98 deletions
Show Stats Download Patch File Download Diff File

102
src/feed.js → src/routes/feeds.js
Unescape Escape View File

@ -1,24 +1,63 @@
(function (Feed) {
var db = require('./database'),
posts = require('./posts'),
topics = require('./topics'),
categories = require('./categories'),
(function (Feeds) {
var posts = require('../posts'),
topics = require('../topics'),
categories = require('../categories'),
fs = require('fs'),
rss = require('rss'),
winston = require('winston'),
path = require('path'),
nconf = require('nconf'),
async = require('async');
Feed.defaults = {
ttl: 60
ThreadTools = require('../threadTools'),
CategoryTools = require('../categoryTools');
Feeds.createRoutes = function(app){
app.get('/topic/:topic_id.rss', hasTopicPrivileges, generateForTopic);
app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
app.get('/recent.rss', generateForRecent);
app.get('/popular.rss', generateForPopular);
};
Feed.forTopic = function (tid, callback) {
function hasTopicPrivileges(req, res, next) {
var tid = req.params.topic_id;
var uid = req.user ? req.user.uid || 0 : 0;
ThreadTools.privileges(tid, uid, function(err, privileges) {
if(err) {
return next(err);
}
if(!privileges.read) {
return res.redirect('403');
}
return next();
});
}
function hasCategoryPrivileges(req, res, next) {
var cid = req.params.category_id;
var uid = req.user ? req.user.uid || 0 : 0;
CategoryTools.privileges(cid, uid, function(err, privileges) {
if(err) {
return next(err);
}
if(!privileges.read) {
return res.redirect('403');
}
return next();
});
}
function generateForTopic(req, res, next) {
var tid = req.params.tid;
topics.getTopicWithPosts(tid, 0, 0, 25, true, function (err, topicData) {
if (err) {
return callback(new Error('topic-invalid'));
return next(err);
}
var description = topicData.posts.length ? topicData.posts[0].content : '';
@ -32,7 +71,7 @@
site_url: nconf.get('url') + '/topic/' + topicData.slug,
image_url: image_url,
author: author,
ttl: Feed.defaults.ttl
ttl: 60
}),
dateStamp;
@ -55,15 +94,18 @@
}
});
callback(null, feed.xml());
var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
Feed.forCategory = function (cid, callback) {
function generateForCategory(req, res, next) {
var cid = req.params.category_id;
categories.getCategoryById(cid, 0, 25, 0, function (err, categoryData) {
if (err) {
return callback(new Error('category-invalid'));
return next(err);
}
var feed = new rss({
@ -71,7 +113,7 @@
description: categoryData.category_description,
feed_url: nconf.get('url') + '/category/' + cid + '.rss',
site_url: nconf.get('url') + '/category/' + categoryData.category_id,
ttl: Feed.defaults.ttl
ttl: 60
});
// Add pubDate if category has topics
@ -86,15 +128,15 @@
});
});
callback(null, feed.xml());
var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
Feed.forRecent = function(callback) {
topics.getLatestTopics(0, 0, 19, undefined, function (err, recentData) {
function generateForRecent(req, res, next) {
topics.getLatestTopics(0, 0, 19, 'month', function (err, recentData) {
if(err){
return callback(err);
return next(err);
}
var feed = new rss({
@ -102,7 +144,7 @@
description: 'A list of topics that have been active within the past 24 hours',
feed_url: nconf.get('url') + '/recent.rss',
site_url: nconf.get('url') + '/recent',
ttl: Feed.defaults.ttl
ttl: 60
});
// Add pubDate if recent topics list contains topics
@ -119,14 +161,15 @@
});
});
callback(null, feed.xml());
var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
Feed.forPopular = function(callback) {
function generateForPopular(req, res, next) {
topics.getTopicsFromSet(0, 'topics:posts', 0, 19, function (err, popularData) {
if(err){
return callback(err);
return next(err);
}
var feed = new rss({
@ -134,7 +177,7 @@
description: 'A list of topics that are sorted by post count',
feed_url: nconf.get('url') + '/popular.rss',
site_url: nconf.get('url') + '/popular',
ttl: Feed.defaults.ttl
ttl: 60
});
// Add pubDate if recent topics list contains topics
@ -151,7 +194,8 @@
});
});
callback(null, feed.xml());
var xml = feed.xml();
res.type('xml').set('Content-Length', Buffer.byteLength(xml)).send(xml);
});
};
}(exports));

71
src/webserver.js
Unescape Escape View File

@ -25,9 +25,9 @@ var path = require('path'),
admin = require('./routes/admin'),
userRoute = require('./routes/user'),
apiRoute = require('./routes/api'),
feedsRoute = require('./routes/feeds'),
auth = require('./routes/authentication'),
meta = require('./meta'),
feed = require('./feed'),
plugins = require('./plugins'),
logger = require('./logger'),
templates = require('./../public/src/templates'),
@ -446,74 +446,7 @@ module.exports.server = server;
admin.createRoutes(app);
userRoute.createRoutes(app);
apiRoute.createRoutes(app);
// RSS Feeds:
app.get('/topic/:topic_id.rss', function(req, res, next) {
var tid = req.params.topic_id;
var uid = req.user ? req.user.uid || 0 : 0;
ThreadTools.privileges(tid, uid, function(err, privileges) {
if(err) {
return next(err);
}
if(!privileges.read) {
return res.redirect('403');
}
feed.forTopic(tid, function(err, feedData){
if(err) {
return next(err);
}
res.type('xml').set('Content-Length', Buffer.byteLength(feedData)).send(feedData);
});
});
});
app.get('/category/:category_id.rss', function(req, res, next){
var cid = req.params.category_id;
var uid = req.user ? req.user.uid || 0 : 0;
CategoryTools.privileges(cid, uid, function(err, privileges) {
if(err) {
return next(err);
}
if(!privileges.read) {
return res.redirect('403');
}
feed.forCategory(cid, function(err, feedData){
if(err) {
return next(err);
}
res.type('xml').set('Content-Length', Buffer.byteLength(feedData)).send(feedData);
})
});
});
app.get('/recent.rss', function(req, res, next) {
feed.forRecent(function(err, feedData){
if(err) {
return next(err);
}
res.type('xml').set('Content-Length', Buffer.byteLength(feedData)).send(feedData);
});
});
app.get('/popular.rss', function(req, res, next) {
feed.forPopular(function(err, feedData){
if(err) {
return next(err);
}
res.type('xml').set('Content-Length', Buffer.byteLength(feedData)).send(feedData);
});
});
feedsRoute.createRoutes(app);
// Basic Routes (entirely client-side parsed, goal is to move the rest of the crap in this file into this one section)
(function () {

Write Preview
Loading…
Cancel
Save