From 61ec0ba56654e121dc018f1a0b0b2e0d64f56708 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 6 Nov 2022 18:32:13 -0800
Subject: [PATCH] Make chat line timestamp adjust to 24-hour time setting

---
 osu.Game/Overlays/Chat/ChatLine.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index b7e3b183dc..4db02db1bc 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,6 +13,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -60,6 +62,8 @@ namespace osu.Game.Overlays.Chat
 
         private Container? highlight;
 
+        private readonly Bindable<bool> prefer24HourTime = new Bindable<bool>();
+
         private bool senderHasColour => !string.IsNullOrEmpty(message.Sender.Colour);
 
         private bool messageHasColour => Message.IsAction && senderHasColour;
@@ -78,7 +82,7 @@ namespace osu.Game.Overlays.Chat
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider? colourProvider)
+        private void load(OverlayColourProvider? colourProvider, OsuConfigManager configManager)
         {
             usernameColour = senderHasColour
                 ? Color4Extensions.FromHex(message.Sender.Colour)
@@ -130,6 +134,8 @@ namespace osu.Game.Overlays.Chat
                     },
                 }
             };
+
+            configManager.BindWith(OsuSetting.Prefer24HourTime, prefer24HourTime);
         }
 
         protected override void LoadComplete()
@@ -138,6 +144,8 @@ namespace osu.Game.Overlays.Chat
 
             updateMessageContent();
             FinishTransforms(true);
+
+            prefer24HourTime.BindValueChanged(_ => updateTimestamp(), true);
         }
 
         /// <summary>
@@ -167,7 +175,7 @@ namespace osu.Game.Overlays.Chat
             this.FadeTo(message is LocalEchoMessage ? 0.4f : 1.0f, 500, Easing.OutQuint);
             timestamp.FadeTo(message is LocalEchoMessage ? 0 : 1, 500, Easing.OutQuint);
 
-            timestamp.Text = $@"{message.Timestamp.LocalDateTime:HH:mm:ss}";
+            updateTimestamp();
             username.Text = $@"{message.Sender.Username}";
 
             // remove non-existent channels from the link list
@@ -177,6 +185,13 @@ namespace osu.Game.Overlays.Chat
             ContentFlow.AddLinks(message.DisplayContent, message.Links);
         }
 
+        private void updateTimestamp()
+        {
+            timestamp.Text = prefer24HourTime.Value
+                ? $@"{message.Timestamp.LocalDateTime:HH:mm:ss}"
+                : $@"{message.Timestamp.LocalDateTime:hh:mm:ss tt}";
+        }
+
         private Drawable createUsername()
         {
             username = new OsuSpriteText