From e22660dfd99c3098d3acaf36d9f29182c9c9becd Mon Sep 17 00:00:00 2001
From: Levitating Pineapple <noreply@levitatingpineapple.com>
Date: Thu, 29 Aug 2024 23:41:32 +0300
Subject: [PATCH] revert formatTimestampText

---
 apps/ios/Shared/Views/Chat/ChatView.swift |  2 +-
 apps/ios/SimpleXChat/ChatTypes.swift      | 26 +++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/apps/ios/Shared/Views/Chat/ChatView.swift b/apps/ios/Shared/Views/Chat/ChatView.swift
index dd79405285..a5b0380a65 100644
--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -780,7 +780,7 @@ struct ChatView: View {
                 let nextItem = im.reversedChatItems[i - 1]
                 let largeGap = !nextItem.chatDir.sameDirection(chatItem.chatDir) || nextItem.meta.itemTs.timeIntervalSince(chatItem.meta.itemTs) > 60
                 return (
-                    timestamp: largeGap || formatTimestampText(chatItem.meta.itemTs) != formatTimestampText(nextItem.meta.itemTs),
+                    timestamp: largeGap || formatTimestampMeta(chatItem.meta.itemTs) != formatTimestampMeta(nextItem.meta.itemTs),
                     largeGap: largeGap,
                     date: Calendar.current.isDate(chatItem.meta.itemTs, inSameDayAs: nextItem.meta.itemTs) ? nil : nextItem.meta.itemTs
                 )
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index 07340bb963..393d292fdf 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -2713,7 +2713,7 @@ public struct CIMeta: Decodable, Hashable {
     public var deletable: Bool
     public var editable: Bool
 
-    public var timestampText: Text { get { formatTimestampText(itemTs) } }
+    public var timestampText: Text { Text(formatTimestampMeta(itemTs)) }
     public var recent: Bool { updatedAt + 10 > .now }
     public var isLive: Bool { itemLive == true }
     public var disappearing: Bool { !isRcvNew && itemTimed?.deleteAt != nil }
@@ -2765,10 +2765,32 @@ public struct CITimed: Decodable, Hashable {
     public var deleteAt: Date?
 }
 
+let msgTimeFormat = Date.FormatStyle.dateTime.hour().minute()
+let msgDateFormat = Date.FormatStyle.dateTime.day(.twoDigits).month(.twoDigits)
+
 public func formatTimestampText(_ date: Date) -> Text {
-    Text(verbatim: date.formatted(date: .omitted, time: .shortened))
+    Text(verbatim: date.formatted(recent(date) ? msgTimeFormat : msgDateFormat))
 }
 
+public func formatTimestampMeta(_ date: Date) -> String {
+    date.formatted(date: .omitted, time: .shortened)
+}
+
+private func recent(_ date: Date) -> Bool {
+     let now = Date()
+     let calendar = Calendar.current
+
+     guard let previousDay = calendar.date(byAdding: DateComponents(day: -1), to: now),
+           let previousDay18 = calendar.date(bySettingHour: 18, minute: 0, second: 0, of: previousDay),
+           let currentDay00 = calendar.date(bySettingHour: 0, minute: 0, second: 0, of: now),
+           let currentDay12 = calendar.date(bySettingHour: 12, minute: 0, second: 0, of: now) else {
+         return false
+     }
+
+     let isSameDay = calendar.isDate(date, inSameDayAs: now)
+     return isSameDay || (now < currentDay12 && date >= previousDay18 && date < currentDay00)
+ }
+
 public enum CIStatus: Decodable, Hashable {
     case sndNew
     case sndSent(sndProgress: SndCIStatusProgress)