fix link tag url

src/controllers/topics.js

@@ -15,7 +15,7 @@ var helpers = require('./helpers');
 var pagination = require('../pagination');
 var utils = require('../utils');
 
-var topicsController = {};
+var topicsController = module.exports;
 
 topicsController.get = function (req, res, callback) {
 	var tid = req.params.topic_id;
@@ -134,25 +134,77 @@ topicsController.get = function (req, res, callback) {
 			plugins.fireHook('filter:controllers.topic.get', { topicData: topicData, uid: req.uid }, next);
 		},
 		function (data, next) {
+			buildBreadcrumbs(data.topicData, next);
+		},
+		function (topicData) {
+			topicData.privileges = userPrivileges;
+			topicData.topicStaleDays = parseInt(meta.config.topicStaleDays, 10) || 60;
+			topicData['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
+			topicData['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
+			topicData['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
+			topicData.bookmarkThreshold = parseInt(meta.config.bookmarkThreshold, 10) || 5;
+			topicData.postEditDuration = parseInt(meta.config.postEditDuration, 10) || 0;
+			topicData.postDeleteDuration = parseInt(meta.config.postDeleteDuration, 10) || 0;
+			topicData.scrollToMyPost = settings.scrollToMyPost;
+			topicData.rssFeedUrl = nconf.get('relative_path') + '/topic/' + topicData.tid + '.rss';
+			if (req.uid) {
+				topicData.rssFeedUrl += '?uid=' + req.uid + '&token=' + rssToken;
+			}
+			topicData.postIndex = req.params.post_index;
+			topicData.pagination = pagination.create(currentPage, pageCount, req.query);
+			topicData.pagination.rel.forEach(function (rel) {
+				rel.href = nconf.get('url') + '/topic/' + topicData.slug + rel.href;
+				res.locals.linkTags.push(rel);
+			});
+
+			req.session.tids_viewed = req.session.tids_viewed || {};
+			if (!req.session.tids_viewed[tid] || req.session.tids_viewed[tid] < Date.now() - 3600000) {
+				topics.increaseViewCount(tid);
+				req.session.tids_viewed[tid] = Date.now();
+			}
+
+			addTags(topicData, req, res);
+
+			if (req.uid) {
+				topics.markAsRead([tid], req.uid, function (err, markedRead) {
+					if (err) {
+						return callback(err);
+					}
+					if (markedRead) {
+						topics.pushUnreadCount(req.uid);
+						topics.markTopicNotificationsRead([tid], req.uid);
+					}
+				});
+			}
+
+			res.render('topic', topicData);
+		},
+	], callback);
+};
+
+function buildBreadcrumbs(topicData, callback) {
 	var breadcrumbs = [
 		{
-					text: data.topicData.category.name,
-					url: nconf.get('relative_path') + '/category/' + data.topicData.category.slug,
+			text: topicData.category.name,
+			url: nconf.get('relative_path') + '/category/' + topicData.category.slug,
 		},
 		{
-					text: data.topicData.title,
+			text: topicData.title,
 		},
 	];
 
-			helpers.buildCategoryBreadcrumbs(data.topicData.category.parentCid, function (err, crumbs) {
-				if (err) {
-					return next(err);
-				}
-				data.topicData.breadcrumbs = crumbs.concat(breadcrumbs);
-				next(null, data.topicData);
-			});
+	async.waterfall([
+		function (next) {
+			helpers.buildCategoryBreadcrumbs(topicData.category.parentCid, next);
 		},
-		function (topicData, next) {
+		function (crumbs, next) {
+			topicData.breadcrumbs = crumbs.concat(breadcrumbs);
+			next(null, topicData);
+		},
+	], callback);
+}
+
+function addTags(topicData, req, res) {
 	function findPost(index) {
 		for (var i = 0; i < topicData.posts.length; i += 1) {
 			if (parseInt(topicData.posts[i].index, 10) === parseInt(index, 10)) {
@@ -189,7 +241,6 @@ topicsController.get = function (req, res, callback) {
 	}
 
 	description = description.replace(/\n/g, ' ');
-
 	res.locals.metaTags = [
 		{
 			name: 'title',
@@ -239,7 +290,7 @@ topicsController.get = function (req, res, callback) {
 		{
 			rel: 'alternate',
 			type: 'application/rss+xml',
-					href: nconf.get('url') + '/topic/' + tid + '.rss',
+			href: topicData.rssFeedUrl,
 		},
 	];
 
@@ -249,55 +300,7 @@ topicsController.get = function (req, res, callback) {
 			href: nconf.get('url') + '/category/' + topicData.category.slug,
 		});
 	}
-
-			next(null, topicData);
-		},
-	], function (err, data) {
-		if (err) {
-			return callback(err);
-		}
-
-		data.privileges = userPrivileges;
-		data.topicStaleDays = parseInt(meta.config.topicStaleDays, 10) || 60;
-		data['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
-		data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
-		data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
-		data.bookmarkThreshold = parseInt(meta.config.bookmarkThreshold, 10) || 5;
-		data.postEditDuration = parseInt(meta.config.postEditDuration, 10) || 0;
-		data.postDeleteDuration = parseInt(meta.config.postDeleteDuration, 10) || 0;
-		data.scrollToMyPost = settings.scrollToMyPost;
-		data.rssFeedUrl = nconf.get('relative_path') + '/topic/' + data.tid + '.rss';
-		if (req.uid) {
-			data.rssFeedUrl += '?uid=' + req.uid + '&token=' + rssToken;
-		}
-		data.postIndex = req.params.post_index;
-		data.pagination = pagination.create(currentPage, pageCount, req.query);
-		data.pagination.rel.forEach(function (rel) {
-			rel.href = nconf.get('url') + '/topic/' + data.slug + rel.href;
-			res.locals.linkTags.push(rel);
-		});
-
-		req.session.tids_viewed = req.session.tids_viewed || {};
-		if (!req.session.tids_viewed[tid] || req.session.tids_viewed[tid] < Date.now() - 3600000) {
-			topics.increaseViewCount(tid);
-			req.session.tids_viewed[tid] = Date.now();
-		}
-
-		if (req.uid) {
-			topics.markAsRead([tid], req.uid, function (err, markedRead) {
-				if (err) {
-					return callback(err);
-				}
-				if (markedRead) {
-					topics.pushUnreadCount(req.uid);
-					topics.markTopicNotificationsRead([tid], req.uid);
-				}
-			});
-		}
-
-		res.render('topic', data);
-	});
-};
+}
 
 topicsController.teaser = function (req, res, next) {
 	var tid = req.params.topic_id;
@@ -363,5 +366,3 @@ topicsController.pagination = function (req, res, callback) {
 		res.json(paginationData);
 	});
 };
-
-module.exports = topicsController;

test/feeds.js

@@ -181,6 +181,7 @@ describe('feeds', function () {
 
 		it('should not allow access if token is correct but has no privilege', function (done) {
 			privileges.categories.rescind(['read'], cid, 'registered-users', function (err) {
+				assert.ifError(err);
 				request(nconf.get('url') + '/category/' + cid + '.rss?uid=' + fooUid + '&token=' + rssToken, { }, function (err, res, body) {
 					assert.ifError(err);
 					assert.equal(res.statusCode, 200);