From 9ce6f8ad9390190a0da5a6b07dc27c172ca021e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 16 Feb 2021 23:12:10 -0500
Subject: [PATCH] feat: add tag filter to getSortedTopics

---
 public/src/modules/topicList.js        |  1 +
 src/controllers/recent.js              |  3 ++-
 src/socket.io/topics/infinitescroll.js |  1 +
 src/topics/sorted.js                   | 35 ++++++++++++++++++++------
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/public/src/modules/topicList.js b/public/src/modules/topicList.js
index 58a7d23ae3..0ef31e53f9 100644
--- a/public/src/modules/topicList.js
+++ b/public/src/modules/topicList.js
@@ -209,6 +209,7 @@ define('topicList', [
 			sort: tplToSort[templateName],
 			count: config.topicsPerPage,
 			cid: query.cid,
+			tags: query.tags,
 			query: query,
 			term: ajaxify.data.selectedTerm && ajaxify.data.selectedTerm.term,
 			filter: ajaxify.data.selectedFilter.filter,
diff --git a/src/controllers/recent.js b/src/controllers/recent.js
index c5fc8cb832..7715fbb89c 100644
--- a/src/controllers/recent.js
+++ b/src/controllers/recent.js
@@ -24,7 +24,7 @@ recentController.get = async function (req, res, next) {
 recentController.getData = async function (req, url, sort) {
 	const page = parseInt(req.query.page, 10) || 1;
 	let term = helpers.terms[req.query.term];
-	const { cid } = req.query;
+	const { cid, tags } = req.query;
 	const filter = req.query.filter || '';
 
 	if (!term && req.query.term) {
@@ -45,6 +45,7 @@ recentController.getData = async function (req, url, sort) {
 
 	const data = await topics.getSortedTopics({
 		cids: cid,
+		tags: tags,
 		uid: req.uid,
 		start: start,
 		stop: stop,
diff --git a/src/socket.io/topics/infinitescroll.js b/src/socket.io/topics/infinitescroll.js
index 4bd3c08db7..bae4ba3a61 100644
--- a/src/socket.io/topics/infinitescroll.js
+++ b/src/socket.io/topics/infinitescroll.js
@@ -78,6 +78,7 @@ module.exports = function (SocketTopics) {
 			return await topics.getUnreadTopics(params);
 		}
 		params.cids = data.cid;
+		params.tags = data.tags;
 		params.sort = data.sort;
 		params.term = data.term;
 		return await topics.getSortedTopics(params);
diff --git a/src/topics/sorted.js b/src/topics/sorted.js
index ce08c48ecf..c2bbe8d7ca 100644
--- a/src/topics/sorted.js
+++ b/src/topics/sorted.js
@@ -24,6 +24,10 @@ module.exports = function (Topics) {
 		if (params.hasOwnProperty('cids') && params.cids && !Array.isArray(params.cids)) {
 			params.cids = [params.cids];
 		}
+		params.tags = params.tags || [];
+		if (params.tags && !Array.isArray(params.tags)) {
+			params.tags = [params.tags];
+		}
 		data.tids = await getTids(params);
 		data.tids = await sortTids(data.tids, params);
 		data.tids = await filterTids(data.tids.slice(0, meta.config.recentMaxTopics), params);
@@ -48,6 +52,8 @@ module.exports = function (Topics) {
 			tids = await db.getSortedSetRevRange(`uid:${params.uid}:followed_tids`, 0, -1);
 		} else if (params.cids) {
 			tids = await getCidTids(params);
+		} else if (params.tags.length) {
+			tids = await getTagTids(params);
 		} else {
 			tids = await db.getSortedSetRevRange(`topics:${params.sort}`, 0, meta.config.recentMaxTopics - 1);
 		}
@@ -55,7 +61,27 @@ module.exports = function (Topics) {
 		return tids;
 	}
 
+	async function getTagTids(params) {
+		const sets = [
+			`topics:${params.sort}`,
+			...params.tags.map(tag => `tag:${tag}:topics`),
+		];
+		return await db.getSortedSetRevIntersect({
+			sets: sets,
+			start: 0,
+			stop: meta.config.recentMaxTopics - 1,
+			weights: sets.map((s, index) => (index ? 0 : 1)),
+		});
+	}
+
 	async function getCidTids(params) {
+		if (params.tags.length) {
+			return _.intersection(...await Promise.all(params.tags.map(async (tag) => {
+				const sets = params.cids.map(cid => `cid:${cid}:tag:${tag}:topics`);
+				return await db.getSortedSetRevRange(sets, 0, -1);
+			})));
+		}
+
 		const sets = [];
 		const pinnedSets = [];
 		params.cids.forEach((cid) => {
@@ -73,7 +99,7 @@ module.exports = function (Topics) {
 	}
 
 	async function sortTids(tids, params) {
-		if (params.term === 'alltime' && !params.cids && params.filter !== 'watched' && !params.floatPinned) {
+		if (params.term === 'alltime' && !params.cids && !params.tags.length && params.filter !== 'watched' && !params.floatPinned) {
 			return tids;
 		}
 		const topicData = await Topics.getTopicsFields(tids, ['tid', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned']);
@@ -94,12 +120,7 @@ module.exports = function (Topics) {
 	}
 
 	function floatPinned(topicData, sortFn) {
-		topicData.sort((a, b) => {
-			if (a.pinned !== b.pinned) {
-				return b.pinned - a.pinned;
-			}
-			return sortFn(a, b);
-		});
+		topicData.sort((a, b) => (a.pinned !== b.pinned ? b.pinned - a.pinned : sortFn(a, b)));
 	}
 
 	function sortRecent(a, b) {