From 304f89c0cf2bac589e9f0a08134760bc14395c6c 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: Mon, 9 Mar 2026 08:17:40 -0400
Subject: [PATCH 1/2] fix: if quoting self, dont add @, but keep the username

without it self quotes look like
"said:
<rest of quote>"
---
 public/src/client/topic/postTools.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index c5016789cb..49a0e23be0 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -386,7 +386,8 @@ define('forum/topic/postTools', [
 			return slug;
 		}
 		const post = button.parents('[data-pid]');
-		if (post.length && !post.hasClass('self-post')) {
+		const isSelfPost = post.hasClass('self-post');
+		if (post.length) {
 			slug = slugify(post.attr('data-username'), true);
 			if (!slug) {
 				if (post.attr('data-uid') !== '0') {
@@ -396,7 +397,7 @@ define('forum/topic/postTools', [
 				}
 			}
 			if (slug && slug !== '[[global:former-user]]' && slug !== '[[global:guest]]') {
-				slug = '@' + slug;
+				slug = isSelfPost ? slug : `@${slug}`;
 			}
 		}
 

From 457f6cf3855f570b531be3099ff2443f45865b76 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: Mon, 9 Mar 2026 10:38:20 -0400
Subject: [PATCH 2/2] fix: hide unread anchor properly when close to bottom

closes #14055
---
 public/src/modules/navigator.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index 766bc02d9c..a10c26055b 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -377,6 +377,10 @@ define('navigator', [
 
 		function toggleAnchor(text) {
 			anchorEl.innerText = text;
+			anchorEl.style.display = text ? 'inline' : 'none';
+			if (text) {
+				translator.translate(text).then(translated => anchorEl.innerText = translated);
+			}
 			anchorEl.setAttribute('aria-disabled', text ? 'false' : 'true');
 			if (text) {
 				anchorEl.removeAttribute('tabindex');
@@ -384,11 +388,11 @@ define('navigator', [
 				anchorEl.setAttribute('tabindex', -1);
 			}
 		}
+		const anchorHeight = anchorEl.getBoundingClientRect().height;
 
-		if (remaining > 0 && (trackHeight - thumbBottom) >= thumbHeight) {
-			const text = await translator.translate(`[[topic:navigator.unread, ${remaining}]]`);
+		if (remaining > 0 && (trackHeight - thumbBottom) >= Math.min(16, anchorHeight)) {
 			anchorEl.href = `${config.relative_path}/topic/${ajaxify.data.slug}/${Math.min(index + 1, ajaxify.data.postcount)}`;
-			toggleAnchor(text);
+			toggleAnchor(`[[topic:navigator.unread, ${remaining}]]`);
 		} else {
 			anchorEl.href = ajaxify.data.url;
 			toggleAnchor('');