remove some dupe code

install/package.json

@@ -78,7 +78,7 @@
         "nodebb-theme-persona": "9.0.15",
         "nodebb-theme-slick": "1.2.4",
         "nodebb-theme-vanilla": "10.0.13",
-        "nodebb-widget-essentials": "4.0.4",
+        "nodebb-widget-essentials": "4.0.6",
         "nodemailer": "^4.6.5",
         "passport": "^0.4.0",
         "passport-local": "1.0.0",

src/topics.js

@@ -228,10 +228,6 @@ Topics.getTopicWithPosts = function (topicData, set, uid, start, stop, reverse,
 			topicData.locked = parseInt(topicData.locked, 10) === 1;
 			topicData.pinned = parseInt(topicData.pinned, 10) === 1;
 
-			topicData.upvotes = parseInt(topicData.upvotes, 10) || 0;
-			topicData.downvotes = parseInt(topicData.downvotes, 10) || 0;
-			topicData.votes = topicData.upvotes - topicData.downvotes;
-
 			topicData.icons = [];
 
 			plugins.fireHook('filter:topic.get', { topic: topicData, uid: uid }, next);

src/topics/data.js

@@ -98,6 +98,15 @@ module.exports = function (Topics) {
 		escapeTitle(topic);
 		topic.timestampISO = utils.toISOString(topic.timestamp);
 		topic.lastposttimeISO = utils.toISOString(topic.lastposttime);
+		if (topic.hasOwnProperty('upvotes')) {
+			topic.upvotes = parseInt(topic.upvotes, 10) || 0;
+		}
+		if (topic.hasOwnProperty('upvotes')) {
+			topic.downvotes = parseInt(topic.downvotes, 10) || 0;
+		}
+		if (topic.hasOwnProperty('upvotes') && topic.hasOwnProperty('downvotes')) {
+			topic.votes = topic.upvotes - topic.downvotes;
+		}
 	}
 
 	Topics.getCategoryData = function (tid, callback) {

src/topics/delete.js

@@ -74,9 +74,7 @@ module.exports = function (Topics) {
 						db.sortedSetAdd('topics:views', topicData.viewcount, tid, next);
 					},
 					function (next) {
-						var upvotes = parseInt(topicData.upvotes, 10) || 0;
+						db.sortedSetAdd('topics:votes', topicData.votes, tid, next);
-						var downvotes = parseInt(topicData.downvotes, 10) || 0;
-						db.sortedSetAdd('topics:votes', upvotes - downvotes, tid, next);
 					},
 					function (next) {
 						async.waterfall([

src/topics/popular.js

@@ -1,73 +1,14 @@
 
 'use strict';
 
-var async = require('async');
-
-var db = require('../database');
-var privileges = require('../privileges');
-
 module.exports = function (Topics) {
-	Topics.getPopular = function (term, uid, count, callback) {
-		count = parseInt(count, 10) || 20;
-		async.waterfall([
-			function (next) {
-				Topics.getPopularTopics(term, uid, 0, count - 1, next);
-			},
-			function (data, next) {
-				next(null, data.topics);
-			},
-		], callback);
-	};
-
 	Topics.getPopularTopics = function (term, uid, start, stop, callback) {
-		var popularTopics = {
+		Topics.getSortedTopics({
-			nextStart: 0,
+			uid: uid,
-			topicCount: 0,
+			start: start,
-			topics: [],
+			stop: stop,
+			term: term,
+			sort: 'posts',
+		}, callback);
 	};
-		async.waterfall([
-			function (next) {
-				if (term === 'alltime') {
-					db.getSortedSetRevRange('topics:posts', 0, 199, next);
-				} else {
-					Topics.getLatestTidsFromSet('topics:tid', 0, -1, term, next);
-				}
-			},
-			function (tids, next) {
-				popularTopics.topicCount = tids.length;
-				getTopics(tids, uid, start, stop, next);
-			},
-			function (topics, next) {
-				popularTopics.topics = topics;
-				popularTopics.nextStart = stop + 1;
-				next(null, popularTopics);
-			},
-		], callback);
-	};
-
-	function getTopics(tids, uid, start, stop, callback) {
-		async.waterfall([
-			function (next) {
-				Topics.getTopicsFields(tids, ['tid', 'postcount', 'deleted'], next);
-			},
-			function (topics, next) {
-				tids = topics.filter(function (topic) {
-					return topic && parseInt(topic.deleted, 10) !== 1;
-				}).sort(sortPopular).slice(start, stop !== -1 ? stop + 1 : undefined).map(function (topic) {
-					return topic.tid;
-				});
-				privileges.topics.filterTids('read', tids, uid, next);
-			},
-			function (tids, next) {
-				Topics.getTopicsByTids(tids, uid, next);
-			},
-		], callback);
-	}
-
-	function sortPopular(a, b) {
-		if (parseInt(a.postcount, 10) !== parseInt(b.postcount, 10)) {
-			return b.postcount - a.postcount;
-		}
-		return parseInt(b.viewcount, 10) - parseInt(a.viewcount, 10);
-	}
 };

src/topics/recent.js

@@ -18,44 +18,135 @@ module.exports = function (Topics) {
 		year: 31104000000,
 	};
 
-	Topics.getRecentTopics = function (cid, uid, start, stop, filter, callback) {
+	Topics.getSortedTopics = function (params, callback) {
-		var recentTopics = {
+		var data = {
 			nextStart: 0,
+			topicCount: 0,
 			topics: [],
 		};
-		if (cid && !Array.isArray(cid)) {
+
-			cid = [cid];
+		params.term = params.term || 'alltime';
+		if (params.hasOwnProperty('cids') && params.cids && !Array.isArray(params.cids)) {
+			params.cids = [params.cids];
 		}
+
+		async.waterfall([
+			function (next) {
+				getTids(params, next);
+			},
+			function (tids, next) {
+				data.topicCount = tids.length;
+				getTopics(tids, params, next);
+			},
+			function (topicData, next) {
+				data.topics = topicData;
+				data.nextStart = params.stop + 1;
+				next(null, data);
+			},
+		], callback);
+	};
+
+	function getTids(params, callback) {
 		async.waterfall([
 			function (next) {
-				var key = 'topics:recent';
+				if (params.term === 'alltime') {
-				if (cid) {
+					var key = 'topics:' + params.sort;
-					key = cid.map(function (cid) {
+					if (params.cids) {
+						key = params.cids.map(function (cid) {
+							if (params.sort === 'recent') {
 								return 'cid:' + cid + ':tids:lastposttime';
+							} else if (params.sort === 'votes') {
+								return 'cid:' + cid + ':tids:votes';
+							} else if (params.sort === 'posts') {
+								return 'cid:' + cid + ':tids:posts';
+							}
+							return 'cid:' + cid + ':tids';
 						});
 					}
+
 					db.getSortedSetRevRange(key, 0, 199, next);
+				} else {
+					Topics.getLatestTidsFromSet('topics:tid', 0, -1, params.term, next);
+				}
 			},
 			function (tids, next) {
-				filterTids(tids, uid, filter, cid, next);
+				if (params.term !== 'alltime') {
+					sortTids(tids, params, next);
+				} else {
+					next(null, tids);
+				}
 			},
 			function (tids, next) {
-				recentTopics.topicCount = tids.length;
+				filterTids(tids, params.uid, params.filter, params.cids, next);
-				tids = tids.slice(start, stop !== -1 ? stop + 1 : undefined);
+			},
-				Topics.getTopicsByTids(tids, uid, next);
+		], callback);
+	}
+
+	function sortTids(tids, params, callback) {
+		async.waterfall([
+			function (next) {
+				Topics.getTopicsFields(tids, ['tid', 'lastposttime', 'upvotes', 'downvotes', 'postcount'], next);
+			},
+			function (topicData, next) {
+				var sortFn = sortRecent;
+				if (params.sort === 'posts') {
+					sortFn = sortPopular;
+				} else if (params.sort === 'votes') {
+					sortFn = sortVotes;
+				}
+				tids = topicData.sort(sortFn).map(function (topic) {
+					return topic && topic.tid;
+				});
+				next(null, tids);
+			},
+		], callback);
+	}
+
+	function sortRecent(a, b) {
+		return b.lastposttime - a.lastposttime;
+	}
+
+	function sortVotes(a, b) {
+		if (parseInt(a.votes, 10) !== parseInt(b.votes, 10)) {
+			return b.votes - a.votes;
+		}
+		return parseInt(b.postcount, 10) - parseInt(a.postcount, 10);
+	}
+
+	function sortPopular(a, b) {
+		if (parseInt(a.postcount, 10) !== parseInt(b.postcount, 10)) {
+			return b.postcount - a.postcount;
+		}
+		return parseInt(b.viewcount, 10) - parseInt(a.viewcount, 10);
+	}
+
+	function getTopics(tids, params, callback) {
+		async.waterfall([
+			function (next) {
+				tids = tids.slice(params.start, params.stop !== -1 ? params.stop + 1 : undefined);
+				Topics.getTopicsByTids(tids, params.uid, next);
 			},
 			function (topicData, next) {
 				topicData.forEach(function (topicObj, i) {
-					topicObj.index = start + i;
+					topicObj.index = params.start + i;
 				});
-				recentTopics.topics = topicData;
+				next(null, topicData);
-				recentTopics.nextStart = stop + 1;
-				next(null, recentTopics);
 			},
 		], callback);
+	}
+
+	Topics.getRecentTopics = function (cid, uid, start, stop, filter, callback) {
+		Topics.getSortedTopics({
+			cids: cid,
+			uid: uid,
+			start: start,
+			stop: stop,
+			filter: filter,
+			sort: 'recent',
+		}, callback);
 	};
 
-	function filterTids(tids, uid, filter, cid, callback) {
+	function filterTids(tids, uid, filter, cids, callback) {
 		async.waterfall([
 			function (next) {
 				if (filter === 'watched') {
@@ -95,10 +186,10 @@ module.exports = function (Topics) {
 				});
 			},
 			function (results, next) {
-				cid = cid && cid.map(String);
+				cids = cids && cids.map(String);
 				tids = results.topicData.filter(function (topic) {
 					if (topic && topic.cid) {
-						return results.ignoredCids.indexOf(topic.cid.toString()) === -1 && (!cid || (cid.length && cid.indexOf(topic.cid.toString()) !== -1));
+						return !results.ignoredCids.includes(topic.cid.toString()) && (!cids || (cids.length && cids.includes(topic.cid.toString())));
 					}
 					return false;
 				}).map(function (topic) {

src/topics/tools.js

@@ -182,12 +182,11 @@ module.exports = function (Topics) {
 								async.apply(db.sortedSetRemove, 'cid:' + topicData.cid + ':tids:votes', tid),
 							], next);
 						} else {
-							var votes = (parseInt(topicData.upvotes, 10) || 0) - (parseInt(topicData.downvotes, 10) || 0);
 							async.parallel([
 								async.apply(db.sortedSetRemove, 'cid:' + topicData.cid + ':tids:pinned', tid),
 								async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids', topicData.lastposttime, tid),
 								async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids:posts', topicData.postcount, tid),
-								async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids:votes', votes, tid),
+								async.apply(db.sortedSetAdd, 'cid:' + topicData.cid + ':tids:votes', topicData.votes, tid),
 							], next);
 						}
 					},

src/topics/top.js

@@ -2,89 +2,15 @@
 
 'use strict';
 
-var async = require('async');
-
-var db = require('../database');
-var privileges = require('../privileges');
-var user = require('../user');
-var meta = require('../meta');
-
 module.exports = function (Topics) {
 	Topics.getTopTopics = function (cid, uid, start, stop, filter, callback) {
-		var topTopics = {
+		Topics.getSortedTopics({
-			nextStart: 0,
+			cids: cid,
-			topics: [],
+			uid: uid,
+			start: start,
+			stop: stop,
+			filter: filter,
+			sort: 'votes',
+		}, callback);
 	};
-		if (cid && !Array.isArray(cid)) {
-			cid = [cid];
-		}
-		async.waterfall([
-			function (next) {
-				var key = 'topics:votes';
-				if (cid) {
-					key = cid.map(function (cid) {
-						return 'cid:' + cid + ':tids:votes';
-					});
-				}
-				db.getSortedSetRevRange(key, 0, 199, next);
-			},
-			function (tids, next) {
-				filterTids(tids, uid, filter, cid, next);
-			},
-			function (tids, next) {
-				topTopics.topicCount = tids.length;
-				tids = tids.slice(start, stop !== -1 ? stop + 1 : undefined);
-				Topics.getTopicsByTids(tids, uid, next);
-			},
-			function (topicData, next) {
-				topTopics.topics = topicData;
-				topTopics.nextStart = stop + 1;
-				next(null, topTopics);
-			},
-		], callback);
-	};
-
-	function filterTids(tids, uid, filter, cid, callback) {
-		async.waterfall([
-			function (next) {
-				if (filter === 'watched') {
-					Topics.filterWatchedTids(tids, uid, next);
-				} else if (filter === 'new') {
-					Topics.filterNewTids(tids, uid, next);
-				} else if (filter === 'unreplied') {
-					Topics.filterUnrepliedTids(tids, next);
-				} else {
-					Topics.filterNotIgnoredTids(tids, uid, next);
-				}
-			},
-			function (tids, next) {
-				privileges.topics.filterTids('read', tids, uid, next);
-			},
-			function (tids, next) {
-				async.parallel({
-					ignoredCids: function (next) {
-						if (filter === 'watched' || parseInt(meta.config.disableRecentCategoryFilter, 10) === 1) {
-							return next(null, []);
-						}
-						user.getIgnoredCategories(uid, next);
-					},
-					topicData: function (next) {
-						Topics.getTopicsFields(tids, ['tid', 'cid'], next);
-					},
-				}, next);
-			},
-			function (results, next) {
-				cid = cid && cid.map(String);
-				tids = results.topicData.filter(function (topic) {
-					if (topic && topic.cid) {
-						return results.ignoredCids.indexOf(topic.cid.toString()) === -1 && (!cid || (cid.length && cid.indexOf(topic.cid.toString()) !== -1));
-					}
-					return false;
-				}).map(function (topic) {
-					return topic.tid;
-				});
-				next(null, tids);
-			},
-		], callback);
-	}
 };