From 8733d09dc49ef0642599f5590fb3615390112ab5 Mon Sep 17 00:00:00 2001
From: MitarashiDango <mitarashi_dango@mail.matcha-soft.com>
Date: Wed, 1 Apr 2026 19:40:54 +0900
Subject: [PATCH] Improve relative time display when post time is in the future
 (#38488)

---
 app/javascript/mastodon/components/status/header.tsx         | 5 ++++-
 .../mastodon/features/account_timeline/v2/status_header.tsx  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/status/header.tsx b/app/javascript/mastodon/components/status/header.tsx
index 65790bb493..9b1445e9c1 100644
--- a/app/javascript/mastodon/components/status/header.tsx
+++ b/app/javascript/mastodon/components/status/header.tsx
@@ -56,7 +56,10 @@ export const StatusHeader: FC<StatusHeaderProps> = ({
         className='status__relative-time'
       >
         <StatusVisibility visibility={status.get('visibility')} />
-        <RelativeTimestamp timestamp={status.get('created_at') as string} />
+        <RelativeTimestamp
+          timestamp={status.get('created_at') as string}
+          noFuture
+        />
         {editedAt && <StatusEditedAt editedAt={editedAt} />}
       </Link>
 
diff --git a/app/javascript/mastodon/features/account_timeline/v2/status_header.tsx b/app/javascript/mastodon/features/account_timeline/v2/status_header.tsx
index 5f0ff88685..9958a47d96 100644
--- a/app/javascript/mastodon/features/account_timeline/v2/status_header.tsx
+++ b/app/javascript/mastodon/features/account_timeline/v2/status_header.tsx
@@ -36,7 +36,10 @@ export const AccountStatusHeader: FC<StatusHeaderProps> = ({
         className='status__relative-time'
       >
         <StatusVisibility visibility={status.get('visibility')} />
-        <RelativeTimestamp timestamp={status.get('created_at') as string} />
+        <RelativeTimestamp
+          timestamp={status.get('created_at') as string}
+          noFuture
+        />
         {editedAt && <StatusEditedAt editedAt={editedAt} />}
       </Link>