improve relative time display

avoonix · Jul 13, 2024 · d5f7b23 · d5f7b23
1 parent 621ee5b
commit d5f7b23
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/fuzzle/src/message/keyboard.rs b/fuzzle/src/message/keyboard.rs
@@ -6,7 +6,7 @@ use crate::{
     database::{Sticker, TagCreator, UserSettings, UserStats},
     inline::{InlineQueryData, SetOperation, TagKind},
     tags::{self, all_count_tags, all_rating_tags, character_count, rating, Category, Characters},
-    util::Emoji,
+    util::{format_relative_time, Emoji},
 };
 use chrono::NaiveDateTime;
 use itertools::Itertools;
@@ -667,11 +667,7 @@ impl Keyboard {
                 },
             )],
             [InlineKeyboardButton::callback(
-                format!(
-                    "🗓️ Set known since {} ({} days)",
-                    created_at.format("%Y-%m-%d"),
-                    (now - created_at).num_days()
-                ),
+                format!( "🗓️ Set added {}", format_relative_time(created_at)),
                 CallbackData::NoAction,
             )],
             [InlineKeyboardButton::switch_inline_query_current_chat(
@@ -716,11 +712,7 @@ impl Keyboard {
                 },
             )],
             vec![InlineKeyboardButton::callback(
-                format!(
-                    "🗓️ Sticker known since {} ({} days)",
-                    created_at.format("%Y-%m-%d"),
-                    (now - created_at).num_days()
-                ),
+                format!( "🗓️ Sticker added {}", format_relative_time(created_at)),
                 CallbackData::NoAction,
             )],
             vec![

diff --git a/fuzzle/src/util/mod.rs b/fuzzle/src/util/mod.rs
@@ -20,10 +20,17 @@ pub fn format_relative_time(time: NaiveDateTime) -> String {
         format!("in {} minutes", duration.num_minutes())
     } else if duration < Duration::minutes(1) {
         "less than a minute ago".to_string()
+    } else if duration < Duration::minutes(5) {
+        "a few minutes ago".to_string()
     } else if duration < Duration::hours(1) {
         format!("{} minutes ago", duration.num_minutes())
     } else if duration < Duration::days(1) {
-        format!("{} hours ago", duration.num_hours())
+        let hours = duration.num_hours();
+        if hours == 1 {
+            "1 hour ago".to_string()
+        } else {
+            format!("{} hours ago", duration.num_hours())
+        }
     } else if duration < Duration::days(2) {
         "yesterday".to_string()
     } else if duration < Duration::weeks(1) {