formatting - server side core

This commit is contained in:
psychobunny
2013-09-17 13:09:37 -04:00
parent c44461e33f
commit aea3181d27
21 changed files with 843 additions and 680 deletions

View File

@@ -31,12 +31,19 @@ var express = require('express'),
* accepts: metaTags
*/
app.build_header = function(options, callback) {
var defaultMetaTags = [
{ name: 'viewport', content: 'width=device-width, initial-scale=1.0' },
{ name: 'content-type', content: 'text/html; charset=UTF-8' },
{ name: 'apple-mobile-web-app-capable', content: 'yes' },
{ property: 'og:site_name', content: meta.config.title || 'NodeBB' },
],
var defaultMetaTags = [{
name: 'viewport',
content: 'width=device-width, initial-scale=1.0'
}, {
name: 'content-type',
content: 'text/html; charset=UTF-8'
}, {
name: 'apple-mobile-web-app-capable',
content: 'yes'
}, {
property: 'og:site_name',
content: meta.config.title || 'NodeBB'
}, ],
metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])),
templateValues = {
cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
@@ -58,21 +65,24 @@ var express = require('express'),
// Middlewares
app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public'), prefix:nconf.get('relative_path') }));
app.use(require('less-middleware')({
src: path.join(__dirname, '../', 'public'),
prefix: nconf.get('relative_path')
}));
app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
app.use(express.bodyParser()); // Puts POST vars in request.body
app.use(express.bodyParser()); // Puts POST vars in request.body
app.use(express.cookieParser()); // If you want to parse cookies (res.cookies)
app.use(express.cookieParser()); // If you want to parse cookies (res.cookies)
app.use(express.compress());
app.use(express.session({
store: new RedisStore({
client: RDB,
ttl: 60*60*24*30
ttl: 60 * 60 * 24 * 30
}),
secret: nconf.get('secret'),
key: 'express.sid',
cookie: {
maxAge: 60*60*24*30*1000 // 30 days
maxAge: 60 * 60 * 24 * 30 * 1000 // 30 days
}
}));
app.use(express.csrf());
@@ -83,7 +93,7 @@ var express = require('express'),
// Static Directories for NodeBB Plugins
app.configure(function() {
var tailMiddlewares = [];
var tailMiddlewares = [];
plugins.ready(function() {
// Remove some middlewares until the router is gone
@@ -92,7 +102,7 @@ var express = require('express'),
tailMiddlewares.push(app.stack.pop());
tailMiddlewares.push(app.stack.pop());
tailMiddlewares.push(app.stack.pop());
for(d in plugins.staticDirs) {
for (d in plugins.staticDirs) {
app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
}
@@ -138,7 +148,9 @@ var express = require('express'),
// respond with json
if (req.accepts('json')) {
res.send({ error: 'Not found' });
res.send({
error: 'Not found'
});
return;
}
@@ -155,7 +167,9 @@ var express = require('express'),
res.status(err.status || 500);
res.json('500', { error: err.message });
res.json('500', {
error: err.message
});
});
@@ -177,19 +191,22 @@ var express = require('express'),
(function() {
var routes = ['login', 'register', 'account', 'recent', 'unread', 'popular', 'active', '403', '404'];
for (var i=0, ii=routes.length; i<ii; i++) {
for (var i = 0, ii = routes.length; i < ii; i++) {
(function(route) {
app.get('/' + route, function(req, res) {
if ((route === 'login' || route ==='register') && (req.user && req.user.uid > 0)) {
if ((route === 'login' || route === 'register') && (req.user && req.user.uid > 0)) {
user.getUserField(req.user.uid, 'userslug', function(err, userslug) {
res.redirect('/users/'+userslug);
res.redirect('/users/' + userslug);
});
return;
}
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route(route) + templates['footer']);
});
});
@@ -204,12 +221,19 @@ var express = require('express'),
app.build_header({
req: req,
res: res,
metaTags: [
{ name: "title", content: meta.config.title || 'NodeBB' },
{ name: "description", content: meta.config.description || '' },
{ property: 'og:title', content: 'Index | ' + (meta.config.title || 'NodeBB') },
{ property: "og:type", content: 'website' }
]
metaTags: [{
name: "title",
content: meta.config.title || 'NodeBB'
}, {
name: "description",
content: meta.config.description || ''
}, {
property: 'og:title',
content: 'Index | ' + (meta.config.title || 'NodeBB')
}, {
property: "og:type",
content: 'website'
}]
}, next);
},
"categories": function(next) {
@@ -233,9 +257,9 @@ var express = require('express'),
if (tid.match(/^\d+\.rss$/)) {
tid = tid.slice(0, -4);
var rssPath = path.join(__dirname, '../', 'feeds/topics', tid + '.rss'),
var rssPath = path.join(__dirname, '../', 'feeds/topics', tid + '.rss'),
loadFeed = function() {
fs.readFile(rssPath, function (err, data) {
fs.readFile(rssPath, function(err, data) {
if (err) res.type('text').send(404, "Unable to locate an rss feed at this location.");
else res.type('xml').set('Content-Length', data.length).send(data);
});
@@ -255,8 +279,8 @@ var express = require('express'),
async.waterfall([
function(next) {
topics.getTopicWithPosts(tid, ((req.user) ? req.user.uid : 0), 0, -1, function(err, topicData) {
if(topicData) {
if(topicData.deleted === '1' && topicData.expose_tools === 0)
if (topicData) {
if (topicData.deleted === '1' && topicData.expose_tools === 0)
return next(new Error('Topic deleted'), null);
}
@@ -267,7 +291,7 @@ var express = require('express'),
var lastMod = 0,
timestamp;
for(var x=0,numPosts=topicData.posts.length;x<numPosts;x++) {
for (var x = 0, numPosts = topicData.posts.length; x < numPosts; x++) {
timestamp = parseInt(topicData.posts[x].timestamp, 10);
if (timestamp > lastMod) lastMod = timestamp;
}
@@ -275,16 +299,31 @@ var express = require('express'),
app.build_header({
req: req,
res: res,
metaTags: [
{ name: "title", content: topicData.topic_name },
{ property: 'og:title', content: topicData.topic_name + ' | ' + (meta.config.title || 'NodeBB') },
{ property: "og:type", content: 'article' },
{ property: "og:url", content: nconf.get('url') + 'topic/' + topicData.slug },
{ property: 'og:image', content: topicData.main_posts[0].picture },
{ property: "article:published_time", content: new Date(parseInt(topicData.main_posts[0].timestamp, 10)).toISOString() },
{ property: 'article:modified_time', content: new Date(lastMod).toISOString() },
{ property: 'article:section', content: topicData.category_name }
]
metaTags: [{
name: "title",
content: topicData.topic_name
}, {
property: 'og:title',
content: topicData.topic_name + ' | ' + (meta.config.title || 'NodeBB')
}, {
property: "og:type",
content: 'article'
}, {
property: "og:url",
content: nconf.get('url') + 'topic/' + topicData.slug
}, {
property: 'og:image',
content: topicData.main_posts[0].picture
}, {
property: "article:published_time",
content: new Date(parseInt(topicData.main_posts[0].timestamp, 10)).toISOString()
}, {
property: 'article:modified_time',
content: new Date(lastMod).toISOString()
}, {
property: 'article:section',
content: topicData.category_name
}]
}, function(err, header) {
next(err, {
header: header,
@@ -310,9 +349,9 @@ var express = require('express'),
if (cid.match(/^\d+\.rss$/)) {
cid = cid.slice(0, -4);
var rssPath = path.join(__dirname, '../', 'feeds/categories', cid + '.rss'),
var rssPath = path.join(__dirname, '../', 'feeds/categories', cid + '.rss'),
loadFeed = function() {
fs.readFile(rssPath, function (err, data) {
fs.readFile(rssPath, function(err, data) {
if (err) res.type('text').send(404, "Unable to locate an rss feed at this location.");
else res.type('xml').set('Content-Length', data.length).send(data);
});
@@ -333,8 +372,8 @@ var express = require('express'),
function(next) {
categories.getCategoryById(cid, 0, function(err, categoryData) {
if(categoryData) {
if(categoryData.disabled === '1')
if (categoryData) {
if (categoryData.disabled === '1')
return next(new Error('Category disabled'), null);
}
next(err, categoryData);
@@ -344,11 +383,16 @@ var express = require('express'),
app.build_header({
req: req,
res: res,
metaTags: [
{ name: 'title', content: categoryData.category_name },
{ name: 'description', content: categoryData.category_description },
{ property: "og:type", content: 'website' }
]
metaTags: [{
name: 'title',
content: categoryData.category_name
}, {
name: 'description',
content: categoryData.category_description
}, {
property: "og:type",
content: 'website'
}]
}, function(err, header) {
next(err, {
header: header,
@@ -357,7 +401,7 @@ var express = require('express'),
});
}
], function(err, data) {
if(err) return res.redirect('404');
if (err) return res.redirect('404');
var category_url = cid + (req.params.slug ? '/' + req.params.slug : '');
res.send(
@@ -370,13 +414,16 @@ var express = require('express'),
});
app.get('/confirm/:code', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + '<script>templates.ready(function(){ajaxify.go("confirm/' + req.params.code + '");});</script>' + templates['footer']);
});
});
app.get('/sitemap.xml', function(req, res) {
var sitemap = require('./sitemap.js');
var sitemap = require('./sitemap.js');
sitemap.render(function(xml) {
res.type('xml').set('Content-Length', xml.length).send(xml);
@@ -385,15 +432,15 @@ var express = require('express'),
app.get('/robots.txt', function(req, res) {
res.set('Content-Type', 'text/plain');
res.send( "User-agent: *\n" +
"Disallow: \n" +
"Disallow: /admin/\n" +
"Sitemap: " + nconf.get('url') + "sitemap.xml");
res.send("User-agent: *\n" +
"Disallow: \n" +
"Disallow: /admin/\n" +
"Sitemap: " + nconf.get('url') + "sitemap.xml");
});
app.get('/cid/:cid', function(req, res) {
categories.getCategoryData(req.params.cid, function(err, data) {
if(data)
if (data)
res.send(data);
else
res.send(404, "Category doesn't exist!");
@@ -401,8 +448,8 @@ var express = require('express'),
});
app.get('/tid/:tid', function(req, res) {
topics.getTopicData(req.params.tid, function(data){
if(data)
topics.getTopicData(req.params.tid, function(data) {
if (data)
res.send(data);
else
res.send(404, "Topic doesn't exist!");
@@ -410,8 +457,8 @@ var express = require('express'),
});
app.get('/pid/:pid', function(req, res) {
posts.getPostData(req.params.pid, function(data){
if(data)
posts.getPostData(req.params.pid, function(data) {
if (data)
res.send(data);
else
res.send(404, "Post doesn't exist!");
@@ -421,7 +468,10 @@ var express = require('express'),
app.get('/outgoing', function(req, res) {
if (!req.query.url) return res.redirect('/404');
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(
header +
'\n\t<script>templates.ready(function(){ajaxify.go("outgoing?url=' + encodeURIComponent(req.query.url) + '", null, null, true);});</script>' +
@@ -431,25 +481,31 @@ var express = require('express'),
});
app.get('/search', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route("search", null, "search") + templates['footer']);
});
});
app.get('/search/:term', function(req, res) {
app.build_header({ req: req, res: res }, function(err, header) {
res.send(header + app.create_route("search/"+req.params.term, null, "search") + templates['footer']);
app.build_header({
req: req,
res: res
}, function(err, header) {
res.send(header + app.create_route("search/" + req.params.term, null, "search") + templates['footer']);
});
});
app.get('/reindex', function(req, res) {
topics.reIndexAll(function(err) {
if(err) {
if (err) {
return res.json(err);
}
user.reIndexAll(function(err) {
if(err) {
if (err) {
return res.json(err);
} else {
res.send('Topics and users reindexed');
@@ -462,4 +518,4 @@ var express = require('express'),
}(WebServer));
server.listen(nconf.get('PORT') || nconf.get('port'));
global.server = server;
global.server = server;