From 77f81e5849292b13ca84d18083006476dcacfdec Mon Sep 17 00:00:00 2001 From: shannon Date: Tue, 11 Mar 2025 10:54:22 -0400 Subject: [PATCH] =?UTF-8?q?Do=20not=20show=20seconds=20in=20notification?= =?UTF-8?q?=20timestamp,=20only=20=E2=80=9Cnow=E2=80=9D=20if=20<=201=20min?= =?UTF-8?q?ute?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contributes to #399 [BUG] Multiple interactions do not collapse into a single notification --- MastodonSDK/Sources/MastodonUI/Extension/Date.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MastodonSDK/Sources/MastodonUI/Extension/Date.swift b/MastodonSDK/Sources/MastodonUI/Extension/Date.swift index 7d116962a..d8e321429 100644 --- a/MastodonSDK/Sources/MastodonUI/Extension/Date.swift +++ b/MastodonSDK/Sources/MastodonUI/Extension/Date.swift @@ -11,7 +11,7 @@ import MastodonLocalization let extremeDateAbbreviatingFormatter: DateComponentsFormatter = { let formatter = DateComponentsFormatter() - formatter.allowedUnits = [.day, .hour, .minute, .second] + formatter.allowedUnits = [.day, .hour, .minute] formatter.unitsStyle = .abbreviated formatter.maximumUnitCount = 1 return formatter @@ -46,6 +46,7 @@ extension Date { public var localizedExtremelyAbbreviatedTimeElapsedUntilNow: String { let interval = Date.now.timeIntervalSince(self) + guard interval > TimeInterval(integerLiteral: 60) else { return "now" } return extremeDateAbbreviatingFormatter.string(from: interval) ?? "" } }