adding one more helper function

CMU-17313Q · Sep 3, 2024 · 3f5ef12 · 3f5ef12
1 parent a47eb5a
commit 3f5ef12
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/topics/posts.js b/src/topics/posts.js
@@ -81,17 +81,20 @@ module.exports = function (Topics) {
 		if (!postData.length) {
 			return;
 		}
-		postData.forEach((p, index) => {
+		function setEventTimes(p, nextPost, reverse, topicData) {
 			if (p && p.index === 0 && reverse) {
 				p.eventStart = topicData.lastposttime;
 				p.eventEnd = Date.now();
-			} else if (p && postData[index + 1]) {
-				p.eventStart = reverse ? postData[index + 1].timestamp : p.timestamp;
-				p.eventEnd = reverse ? p.timestamp : postData[index + 1].timestamp;
+			} else if (p && nextPost) {
+				p.eventStart = reverse ? nextPost.timestamp : p.timestamp;
+				p.eventEnd = reverse ? p.timestamp : nextPost.timestamp;
 			}
+		}
+		postData.forEach((p, index) => {
+			const nextPost = postData[index + 1];
+			setEventTimes(p, nextPost, reverse, topicData);
 		});
-		const lastPost = postData[postData.length - 1];
-		await handleLastPost(lastPost, set, reverse, topicData);
+		await handleLastPost(postData, set, reverse, topicData);
 	}
 
 	async function handleLastPost(lastPost, set, reverse, topicData) {