style change

src/controllers/recent.js

@@ -11,7 +11,7 @@ var meta = require('../meta');
 var helpers = require('./helpers');
 var pagination = require('../pagination');
 
-var recentController = {};
+var recentController = module.exports;
 
 var validFilter = { '': true, new: true, watched: true };
 
@@ -47,49 +47,44 @@ recentController.get = function (req, res, next) {
 
 			topics.getRecentTopics(cid, req.uid, start, stop, filter, next);
 		},
-	], function (err, data) {
+		function (data) {
-		if (err) {
+			data.categories = categoryData.categories;
-			return next(err);
+			data.selectedCategory = categoryData.selectedCategory;
-		}
+			data.nextStart = stop + 1;
-
+			data.set = 'topics:recent';
-		data.categories = categoryData.categories;
+			data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
-		data.selectedCategory = categoryData.selectedCategory;
+			data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss';
-		data.nextStart = stop + 1;
+			data.title = '[[pages:recent]]';
-		data.set = 'topics:recent';
+			data.filters = [{
-		data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
+				name: '[[unread:all-topics]]',
-		data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss';
+				url: 'recent',
-		data.title = '[[pages:recent]]';
+				selected: filter === '',
-		data.filters = [{
+				filter: '',
-			name: '[[unread:all-topics]]',
+			}, {
-			url: 'recent',
+				name: '[[unread:new-topics]]',
-			selected: filter === '',
+				url: 'recent/new',
-			filter: '',
+				selected: filter === 'new',
-		}, {
+				filter: 'new',
-			name: '[[unread:new-topics]]',
+			}, {
-			url: 'recent/new',
+				name: '[[unread:watched-topics]]',
-			selected: filter === 'new',
+				url: 'recent/watched',
-			filter: 'new',
+				selected: filter === 'watched',
-		}, {
+				filter: 'watched',
-			name: '[[unread:watched-topics]]',
+			}];
-			url: 'recent/watched',
+
-			selected: filter === 'watched',
+			data.selectedFilter = data.filters.find(function (filter) {
-			filter: 'watched',
+				return filter && filter.selected;
-		}];
+			});
-
+
-		data.selectedFilter = data.filters.find(function (filter) {
+			var pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage));
-			return filter && filter.selected;
+			data.pagination = pagination.create(page, pageCount, req.query);
-		});
+
-
+			if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) {
-		var pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage));
+				data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[recent:title]]' }]);
-		data.pagination = pagination.create(page, pageCount, req.query);
+			}
-
+
-		if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) {
+			data.querystring = cid ? ('?cid=' + validator.escape(String(cid))) : '';
-			data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[recent:title]]' }]);
+			res.render('recent', data);
-		}
+		},
-
+	], next);
-		data.querystring = cid ? ('?cid=' + validator.escape(String(cid))) : '';
-		res.render('recent', data);
-	});
 };
-
-module.exports = recentController;