From 799e94e02e7c2495e16032646d5a5e7e56b70c79 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, 5 Apr 2022 15:37:31 -0400
Subject: [PATCH] feat: #10460, add cutoff to suggested topics

---
 src/search.js           | 13 +++++++++----
 src/topics/suggested.js | 35 +++++++++++++++++++++++------------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/search.js b/src/search.js
index d71430c437..d5555a21fb 100644
--- a/src/search.js
+++ b/src/search.js
@@ -72,10 +72,6 @@ async function searchInContent(data) {
 		]);
 	}
 
-	if (data.returnIds) {
-		return { pids: pids, tids: tids };
-	}
-
 	const mainPids = await topics.getMainPids(tids);
 
 	let allPids = mainPids.concat(pids).filter(Boolean);
@@ -87,6 +83,15 @@ async function searchInContent(data) {
 		pids: allPids,
 	});
 
+	if (data.returnIds) {
+		const mainPidsSet = new Set(mainPids);
+		const mainPidToTid = _.zipObject(mainPids, tids);
+		const pidsSet = new Set(pids);
+		const returnPids = allPids.filter(pid => pidsSet.has(pid));
+		const returnTids = allPids.filter(pid => mainPidsSet.has(pid)).map(pid => mainPidToTid[pid]);
+		return { pids: returnPids, tids: returnTids };
+	}
+
 	const itemsPerPage = Math.min(data.itemsPerPage || 10, 100);
 	const returnData = {
 		posts: [],
diff --git a/src/topics/suggested.js b/src/topics/suggested.js
index 1273e79a6e..f62869cf84 100644
--- a/src/topics/suggested.js
+++ b/src/topics/suggested.js
@@ -9,36 +9,42 @@ const privileges = require('../privileges');
 const search = require('../search');
 
 module.exports = function (Topics) {
-	Topics.getSuggestedTopics = async function (tid, uid, start, stop) {
+	Topics.getSuggestedTopics = async function (tid, uid, start, stop, cutoff = 0) {
 		let tids;
 		tid = parseInt(tid, 10);
+		cutoff = cutoff === 0 ? cutoff : (cutoff * 2592000000);
 		const [tagTids, searchTids] = await Promise.all([
-			getTidsWithSameTags(tid),
-			getSearchTids(tid, uid),
+			getTidsWithSameTags(tid, cutoff),
+			getSearchTids(tid, uid, cutoff),
 		]);
 
-		tids = tagTids.concat(searchTids).filter(_tid => _tid !== tid);
+		tids = _.uniq(tagTids.concat(searchTids));
+
 		let categoryTids = [];
 		if (stop !== -1 && tids.length < stop - start + 1) {
-			categoryTids = await getCategoryTids(tid);
+			categoryTids = await getCategoryTids(tid, cutoff);
 		}
 		tids = _.shuffle(_.uniq(tids.concat(categoryTids)));
 		tids = await privileges.topics.filterTids('topics:read', tids, uid);
 
 		let topicData = await Topics.getTopicsByTids(tids, uid);
-		topicData = topicData.filter(topic => topic && !topic.deleted && topic.tid !== tid);
+		topicData = topicData.filter(topic => topic && topic.tid !== tid);
 		topicData = await user.blocks.filter(uid, topicData);
-		topicData = topicData.slice(start, stop !== -1 ? stop + 1 : undefined);
+		topicData = topicData.slice(start, stop !== -1 ? stop + 1 : undefined)
+			.sort((t1, t2) => t2.timestamp - t1.timestamp);
 		return topicData;
 	};
 
-	async function getTidsWithSameTags(tid) {
+	async function getTidsWithSameTags(tid, cutoff) {
 		const tags = await Topics.getTopicTags(tid);
-		const tids = await db.getSortedSetRevRange(tags.map(tag => `tag:${tag}:topics`), 0, -1);
+		let tids = cutoff === 0 ?
+			await db.getSortedSetRevRange(tags.map(tag => `tag:${tag}:topics`), 0, -1) :
+			await db.getSortedSetRevRangeByScore(tags.map(tag => `tag:${tag}:topics`), 0, -1, '+inf', Date.now() - cutoff);
+		tids = tids.filter(_tid => _tid !== tid); // remove self
 		return _.shuffle(_.uniq(tids)).slice(0, 10).map(Number);
 	}
 
-	async function getSearchTids(tid, uid) {
+	async function getSearchTids(tid, uid, cutoff) {
 		const topicData = await Topics.getTopicFields(tid, ['title', 'cid']);
 		const data = await search.search({
 			query: topicData.title,
@@ -47,13 +53,18 @@ module.exports = function (Topics) {
 			categories: [topicData.cid],
 			uid: uid,
 			returnIds: true,
+			timeRange: cutoff !== 0 ? cutoff / 1000 : 0,
+			timeFilter: 'newer',
 		});
+		data.tids = data.tids.filter(_tid => _tid !== tid); // remove self
 		return _.shuffle(data.tids).slice(0, 10).map(Number);
 	}
 
-	async function getCategoryTids(tid) {
+	async function getCategoryTids(tid, cutoff) {
 		const cid = await Topics.getTopicField(tid, 'cid');
-		const tids = await db.getSortedSetRevRange(`cid:${cid}:tids:lastposttime`, 0, 9);
+		const tids = cutoff === 0 ?
+			await db.getSortedSetRevRange(`cid:${cid}:tids:lastposttime`, 0, 9) :
+			await db.getSortedSetRevRangeByScore(`cid:${cid}:tids:lastposttime`, 0, 9, '+inf', Date.now() - cutoff);
 		return _.shuffle(tids.map(Number).filter(_tid => _tid !== tid));
 	}
 };