From 0710f784707d56492a4326aca14d950b428efb2e 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] [Glitch] Improve relative time display when post time is in
 the future

Port 8733d09dc49ef0642599f5590fb3615390112ab5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/components/status_action_bar/index.jsx   | 5 ++++-
 .../glitch/features/account_timeline/v2/status_header.tsx    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/status_action_bar/index.jsx b/app/javascript/flavours/glitch/components/status_action_bar/index.jsx
index 0484f9f8b5..606b6ecfc9 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar/index.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar/index.jsx
@@ -398,7 +398,10 @@ class StatusActionBar extends ImmutablePureComponent {
 
         <div className='status__action-bar-spacer' />
         <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'>
-          <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+          <RelativeTimestamp
+            timestamp={status.get('created_at')}
+            noFuture
+          />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
         </a>
       </div>
     );
diff --git a/app/javascript/flavours/glitch/features/account_timeline/v2/status_header.tsx b/app/javascript/flavours/glitch/features/account_timeline/v2/status_header.tsx
index d05b5e7069..452cda3000 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/v2/status_header.tsx
+++ b/app/javascript/flavours/glitch/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>