From 6fa43b9ef0c0027aeeebcb1aedc207ba3a032682 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 20 Mar 2024 23:18:12 -0400
Subject: [PATCH] Revert "fix: urls in posts and announces"

This reverts commit 4fb6574cf78a859d7dac7124220d77d2c7fb4535.
---
 public/src/modules/helpers.common.js | 11 ++---------
 src/activitypub/inbox.js             |  3 +--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js
index 121a47aa40..820b0c09b3 100644
--- a/public/src/modules/helpers.common.js
+++ b/public/src/modules/helpers.common.js
@@ -25,7 +25,6 @@ module.exports = function (utils, Benchpress, relative_path) {
 		userAgentIcons,
 		buildAvatar,
 		increment,
-		generatePostUrl,
 		generateRepliedTo,
 		generateWrote,
 		isoTimeToLocaleString,
@@ -336,24 +335,18 @@ module.exports = function (utils, Benchpress, relative_path) {
 		return String(value + parseInt(inc, 10));
 	}
 
-	function generatePostUrl(post, property = 'pid') {
-		return utils.isNumber(post[property]) ? `${relative_path}/post/${post[property]}` : post[property];
-	}
-
 	function generateRepliedTo(post, timeagoCutoff) {
 		const displayname = post.parent && post.parent.displayname ?
 			post.parent.displayname : '[[global:guest]]';
 		const isBeforeCutoff = post.timestamp < (Date.now() - (timeagoCutoff * oneDayInMs));
 		const langSuffix = isBeforeCutoff ? 'on' : 'ago';
-		const url = generatePostUrl(post, 'toPid');
-		return `[[topic:replied-to-user-${langSuffix}, ${post.toPid}, ${url}, ${displayname}, ${relative_path}/post/${post.pid}, ${post.timestampISO}]]`;
+		return `[[topic:replied-to-user-${langSuffix}, ${post.toPid}, ${relative_path}/post/${post.toPid}, ${displayname}, ${relative_path}/post/${post.pid}, ${post.timestampISO}]]`;
 	}
 
 	function generateWrote(post, timeagoCutoff) {
 		const isBeforeCutoff = post.timestamp < (Date.now() - (timeagoCutoff * oneDayInMs));
 		const langSuffix = isBeforeCutoff ? 'on' : 'ago';
-		const url = generatePostUrl(post);
-		return `[[topic:wrote-${langSuffix}, ${url}, ${post.timestampISO}]]`;
+		return `[[topic:wrote-${langSuffix}, ${relative_path}/post/${post.pid}, ${post.timestampISO}]]`;
 	}
 
 	function isoTimeToLocaleString(isoTime, locale = 'en-GB') {
diff --git a/src/activitypub/inbox.js b/src/activitypub/inbox.js
index 6c860f79c9..49c50f4ab1 100644
--- a/src/activitypub/inbox.js
+++ b/src/activitypub/inbox.js
@@ -10,7 +10,6 @@ const posts = require('../posts');
 const topics = require('../topics');
 const categories = require('../categories');
 const notifications = require('../notifications');
-const utils = require('../utils');
 const activitypub = require('.');
 
 const socketHelpers = require('../socket.io/helpers');
@@ -155,7 +154,7 @@ inbox.announce = async (req) => {
 	await topics.events.log(tid, {
 		type: 'announce',
 		uid: actor,
-		href: utils.isNumber(pid) ? `/post/${pid}` : pid,
+		href: `/post/${pid}`,
 		pid,
 		timestamp,
 	});