From 374f53eb320844be14d13bf637afc33f2077bb22 Mon Sep 17 00:00:00 2001
From: robrobinbin <>
Date: Tue, 12 Jan 2021 19:59:32 +0100
Subject: [PATCH 1/3] Relative timestamps for recent posts

---
 src/utils.rs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/utils.rs b/src/utils.rs
index 443e6d0..88c1224 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -7,7 +7,7 @@ use base64::encode;
 use regex::Regex;
 use serde_json::from_str;
 use std::collections::HashMap;
-use time::OffsetDateTime;
+use time::{OffsetDateTime, Duration};
 use url::Url;
 
 //
@@ -185,6 +185,18 @@ pub async fn media(data: &serde_json::Value) -> (String, String) {
 	(post_type.to_string(), url)
 }
 
+pub fn time(unix_time: i64) -> String {
+	let time = OffsetDateTime::from_unix_timestamp(unix_time);
+	let time_delta = OffsetDateTime::now_utc() - time;
+	if time_delta > Duration::days(1) {
+		time.format("%b %d '%y") // %b %e '%y
+	} else if time_delta.whole_hours() > 0 {
+		format!("{}h ago", time_delta.whole_hours())
+	} else {
+		format!("{}m ago", time_delta.whole_minutes())
+	}
+}
+
 //
 // JSON PARSING
 //
@@ -227,8 +239,8 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
 		let unix_time: i64 = post["data"]["created_utc"].as_f64().unwrap_or_default().round() as i64;
 		let score = post["data"]["score"].as_i64().unwrap_or_default();
 		let ratio: f64 = post["data"]["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
-		let title = val(post, "title");
-
+		let title = val(post, "title");	
+		
 		// Determine the type of media along with the media URL
 		let (post_type, media) = media(&post["data"]).await;
 
@@ -263,7 +275,7 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
 				stickied: post["data"]["stickied"].as_bool().unwrap_or_default(),
 			},
 			permalink: val(post, "permalink"),
-			time: OffsetDateTime::from_unix_timestamp(unix_time).format("%b %d '%y"), // %b %e '%y
+			time: time(unix_time),
 		});
 	}
 

From 2d4ca2379f9c0121312e9e60ee6b8480521cfaee Mon Sep 17 00:00:00 2001
From: robrobinbin <robindepril@gmail.com>
Date: Tue, 12 Jan 2021 20:02:35 +0100
Subject: [PATCH 2/3] whitespace

---
 src/utils.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/utils.rs b/src/utils.rs
index 88c1224..2d4100c 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -239,8 +239,7 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
 		let unix_time: i64 = post["data"]["created_utc"].as_f64().unwrap_or_default().round() as i64;
 		let score = post["data"]["score"].as_i64().unwrap_or_default();
 		let ratio: f64 = post["data"]["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
-		let title = val(post, "title");	
-		
+		let title = val(post, "title");
 		// Determine the type of media along with the media URL
 		let (post_type, media) = media(&post["data"]).await;
 

From 32e1469e115305a2c89dd04a1ebc83b11f83b721 Mon Sep 17 00:00:00 2001
From: robrobinbin <robindepril@gmail.com>
Date: Tue, 12 Jan 2021 20:03:54 +0100
Subject: [PATCH 3/3] whitespace

---
 src/utils.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils.rs b/src/utils.rs
index 2d4100c..0003cf0 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -240,6 +240,7 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
 		let score = post["data"]["score"].as_i64().unwrap_or_default();
 		let ratio: f64 = post["data"]["upvote_ratio"].as_f64().unwrap_or(1.0) * 100.0;
 		let title = val(post, "title");
+
 		// Determine the type of media along with the media URL
 		let (post_type, media) = media(&post["data"]).await;