From cc4f4e72828420ca49e1cd6079896874fcccb053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sat, 15 Jul 2017 16:57:41 -0400
Subject: [PATCH] style changes

---
 src/controllers/categories.js | 49 ++++++++++++++++-------------------
 src/socket.io/topics/move.js  | 15 +++++------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/controllers/categories.js b/src/controllers/categories.js
index 9a17a47fc2..25e384c0ed 100644
--- a/src/controllers/categories.js
+++ b/src/controllers/categories.js
@@ -7,7 +7,7 @@ var categories = require('../categories');
 var meta = require('../meta');
 var helpers = require('./helpers');
 
-var categoriesController = {};
+var categoriesController = module.exports;
 
 categoriesController.list = function (req, res, next) {
 	res.locals.metaTags = [{
@@ -34,32 +34,27 @@ categoriesController.list = function (req, res, next) {
 
 			categories.getRecentTopicReplies(allCategories, req.uid, next);
 		},
-	], function (err) {
-		if (err) {
-			return next(err);
-		}
-
-		var data = {
-			title: '[[pages:categories]]',
-			categories: categoryData,
-		};
-
-		if (req.path.startsWith('/api/categories') || req.path.startsWith('/categories')) {
-			data.breadcrumbs = helpers.buildBreadcrumbs([{ text: data.title }]);
-		}
-
-		data.categories.forEach(function (category) {
-			if (category && Array.isArray(category.posts) && category.posts.length) {
-				category.teaser = {
-					url: nconf.get('relative_path') + '/topic/' + category.posts[0].topic.slug + '/' + category.posts[0].index,
-					timestampISO: category.posts[0].timestampISO,
-					pid: category.posts[0].pid,
-				};
+		function () {
+			var data = {
+				title: '[[pages:categories]]',
+				categories: categoryData,
+			};
+
+			if (req.path.startsWith('/api/categories') || req.path.startsWith('/categories')) {
+				data.breadcrumbs = helpers.buildBreadcrumbs([{ text: data.title }]);
 			}
-		});
 
-		res.render('categories', data);
-	});
+			data.categories.forEach(function (category) {
+				if (category && Array.isArray(category.posts) && category.posts.length) {
+					category.teaser = {
+						url: nconf.get('relative_path') + '/post/' + category.posts[0].pid,
+						timestampISO: category.posts[0].timestampISO,
+						pid: category.posts[0].pid,
+					};
+				}
+			});
+
+			res.render('categories', data);
+		},
+	], next);
 };
-
-module.exports = categoriesController;
diff --git a/src/socket.io/topics/move.js b/src/socket.io/topics/move.js
index 9faffa910b..efd6562d18 100644
--- a/src/socket.io/topics/move.js
+++ b/src/socket.io/topics/move.js
@@ -30,17 +30,14 @@ module.exports = function (SocketTopics) {
 					topicData.tid = tid;
 					topics.tools.move(tid, data.cid, socket.uid, next);
 				},
-			], function (err) {
-				if (err) {
-					return next(err);
-				}
-
-				socketHelpers.emitToTopicAndCategory('event:topic_moved', topicData);
+				function (next) {
+					socketHelpers.emitToTopicAndCategory('event:topic_moved', topicData);
 
-				socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved_your_topic');
+					socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved_your_topic');
 
-				next();
-			});
+					next();
+				},
+			], next);
 		}, callback);
 	};