From 44d88352242350cd440e7592b89a759f2863e2e1 Mon Sep 17 00:00:00 2001
From: Erke Xia <exia@andrew.cmu.edu>
Date: Wed, 25 Sep 2024 02:17:19 +0000
Subject: [PATCH 1/3] Adding logic to sort the posts by popularity. Still need
 to be tested

---
 src/categories/topics.js          | 33 ++++++++++++++++++++++++++++++-
 src/controllers/category.js       |  2 +-
 src/views/admin/settings/post.tpl |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/categories/topics.js b/src/categories/topics.js
index 1a2a259f3d..76b22b59d4 100644
--- a/src/categories/topics.js
+++ b/src/categories/topics.js
@@ -98,8 +98,39 @@ module.exports = function (Categories) {
 			most_votes: `cid:${cid}:tids:votes`,
 			most_views: `cid:${cid}:tids:views`,
 		};
+		let set;
+		if (sort === 'popularity') {
+			const voteSortedSet = `cid:${cid}:tids:votes`;
+			const createSortedSet = `cid:${cid}:tids:create`;
+			const postIdsWithScores = await db.getSortedSetRangeWithScores(voteSortedSet, 0, -1);
+			const tempSortedSet = `cid:${cid}:tids:popular`;
+			await db.delete(tempSortedSet); 
+			const recentIdsWithScores = await db.getSortedSetRangeWithScores(createSortedSet, 0, -1);
 
-		let set = sortToSet.hasOwnProperty(sort) ? sortToSet[sort] : `cid:${cid}:tids`;
+			const currentTime = Date.now();
+			for (let i = 0; i < postIdsWithScores.length; i += 1) {
+				const postId = postIdsWithScores[i];
+				const votes = postIdsWithScores[i];
+	
+				const result = recentIdsWithScores.find(item => item.value === postId['value']);
+				const postCreationTime = result ? result.score : null;
+				if (!postCreationTime) {
+					continue;
+				}
+
+				const timeSinceCreation = (currentTime - postCreationTime) /3600000; 
+				const votes_num = votes['score'] + 1;
+				const time = Math.pow(timeSinceCreation+2,1.8)
+				const score = votes_num / time;
+
+				await db.sortedSetAdd(tempSortedSet, score, postId['value']);
+			}
+
+
+			set = tempSortedSet;
+		}else{
+			set = sortToSet.hasOwnProperty(sort) ? sortToSet[sort] : `cid:${cid}:tids`;
+		}
 
 		if (data.tag) {
 			if (Array.isArray(data.tag)) {
diff --git a/src/controllers/category.js b/src/controllers/category.js
index 487ea21cce..726b5a6e27 100644
--- a/src/controllers/category.js
+++ b/src/controllers/category.js
@@ -21,7 +21,7 @@ const categoryController = module.exports;
 const url = nconf.get('url');
 const relative_path = nconf.get('relative_path');
 const validSorts = [
-	'recently_replied', 'recently_created', 'most_posts', 'most_votes', 'most_views',
+	'recently_replied', 'recently_created', 'most_posts', 'most_votes', 'most_views', 'popularity',
 ];
 
 categoryController.get = async function (req, res, next) {
diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl
index d361597946..686412a4dc 100644
--- a/src/views/admin/settings/post.tpl
+++ b/src/views/admin/settings/post.tpl
@@ -20,6 +20,7 @@
 					<select id="categoryTopicSort" class="form-select" data-field="categoryTopicSort">
 						<option value="recently_replied">[[admin/settings/post:sorting.recently-replied]]</option>
 						<option value="recently_created">[[admin/settings/post:sorting.recently-created]]</option>
+						<option value="popularity">[[admin/settings/post:sorting.popularity]]</option>
 						<option value="most_posts">[[admin/settings/post:sorting.most-posts]]</option>
 						<option value="most_votes">[[admin/settings/post:sorting.most-votes]]</option>
 						<option value="most_views">[[admin/settings/post:sorting.most-views]]</option>

From 26c7f7f3659e6e2a070405cf4d7586e069d77629 Mon Sep 17 00:00:00 2001
From: Erke Xia <exia@andrew.cmu.edu>
Date: Thu, 10 Oct 2024 23:44:36 +0000
Subject: [PATCH 2/3] fix some style issue

---
 src/categories/topics.js | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/categories/topics.js b/src/categories/topics.js
index 76b22b59d4..485dfb683e 100644
--- a/src/categories/topics.js
+++ b/src/categories/topics.js
@@ -104,31 +104,27 @@ module.exports = function (Categories) {
 			const createSortedSet = `cid:${cid}:tids:create`;
 			const postIdsWithScores = await db.getSortedSetRangeWithScores(voteSortedSet, 0, -1);
 			const tempSortedSet = `cid:${cid}:tids:popular`;
-			await db.delete(tempSortedSet); 
+			await db.delete(tempSortedSet);
 			const recentIdsWithScores = await db.getSortedSetRangeWithScores(createSortedSet, 0, -1);
 
 			const currentTime = Date.now();
 			for (let i = 0; i < postIdsWithScores.length; i += 1) {
 				const postId = postIdsWithScores[i];
 				const votes = postIdsWithScores[i];
-	
-				const result = recentIdsWithScores.find(item => item.value === postId['value']);
+				const result = recentIdsWithScores.find(item => item.value === postId.value);
 				const postCreationTime = result ? result.score : null;
-				if (!postCreationTime) {
-					continue;
+				if (postCreationTime) {
+					const timeSinceCreation = (currentTime - postCreationTime) / 3600000;
+					const votes_num = votes.score + 1;
+					const time = (timeSinceCreation + 2) ** 1.8;
+					const score = votes_num / time;
+					db.sortedSetAdd(tempSortedSet, score, postId.value);
 				}
-
-				const timeSinceCreation = (currentTime - postCreationTime) /3600000; 
-				const votes_num = votes['score'] + 1;
-				const time = Math.pow(timeSinceCreation+2,1.8)
-				const score = votes_num / time;
-
-				await db.sortedSetAdd(tempSortedSet, score, postId['value']);
 			}
 
 
 			set = tempSortedSet;
-		}else{
+		} else {
 			set = sortToSet.hasOwnProperty(sort) ? sortToSet[sort] : `cid:${cid}:tids`;
 		}
 

From e61c064b15b0c95506959ab8e26ac0c4fefa5aa5 Mon Sep 17 00:00:00 2001
From: Erke Xia <exia@andrew.cmu.edu>
Date: Fri, 11 Oct 2024 03:48:17 +0000
Subject: [PATCH 3/3] add test for popularity

---
 test/controllers.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/controllers.js b/test/controllers.js
index 418420303f..bca4c7cbe0 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -1586,6 +1586,20 @@ describe('Controllers', () => {
 			assert.equal(body.topics[1].postcount, 1);
 		});
 
+		it('should sort topics by popularity', async () => {
+			const category = await categories.create({ name: 'popularity-category' });
+			const t1 = await topics.post({ uid: fooUid, cid: category.cid, title: 'topic 1', content: 'topic 1 OP' });
+			const t2 = await topics.post({ uid: fooUid, cid: category.cid, title: 'topic 2', content: 'topic 2 OP' });
+			await topics.vote({ uid: fooUid, tid: t1.topicData.tid, direction: 1 });
+			await topics.reply({ uid: fooUid, content: 'topic 1 reply', tid: t1.topicData.tid });
+			await topics.vote({ uid: fooUid, tid: t2.topicData.tid, direction: 2 });
+			await topics.reply({ uid: fooUid, content: 'topic 2 reply', tid: t2.topicData.tid });
+			const { response, body } = await request.get(`${nconf.get('url')}/api/category/${category.slug}?sort=popularity`, { jar });
+			assert.equal(response.statusCode, 200);
+			assert.equal(body.topics[0].title, 'topic 2');
+			assert.equal(body.topics[1].title, 'topic 1');
+		});
+
 		it('should load a specific users topics from a category with tags', async () => {
 			const category = await categories.create({ name: 'filtered-category' });
 			await topics.post({ uid: fooUid, cid: category.cid, title: 'topic 1', content: 'topic 1 OP', tags: ['java', 'cpp'] });