Separate datetime into relative and absolute

src/post.rs

@@ -1,11 +1,10 @@
 // CRATES
-use crate::utils::{cookie, error, format_num, format_url, media, param, parse_rich_flair, prefs, request, rewrite_url, val, Comment, Flags, Flair, Post, Preferences};
+use crate::utils::{Comment, Flags, Flair, Post, Preferences, cookie, error, format_num, format_url, media, param, parse_rich_flair, prefs, request, rewrite_url, time, val};
 use actix_web::{HttpRequest, HttpResponse};
 
 use async_recursion::async_recursion;
 
 use askama::Template;
-use time::OffsetDateTime;
 
 // STRUCTS
 #[derive(Template)]
@@ -67,7 +66,7 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 	let post: &serde_json::Value = &json["data"]["children"][0];
 
 	// Grab UTC time as unix timestamp
-	let unix_time: i64 = post["data"]["created_utc"].as_f64().unwrap_or_default().round() as i64;
+	let (rel_time, created) = time(post["data"]["created_utc"].as_f64().unwrap_or_default());
 	// Parse post score and upvote ratio
 	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;
@@ -115,7 +114,8 @@ async fn parse_post(json: &serde_json::Value) -> Post {
 		},
 		media,
 		domain: val(post, "domain"),
-		time: OffsetDateTime::from_unix_timestamp(unix_time).format("%b %d %Y %H:%M UTC"),
+		rel_time,
+		created
 	}
 }
 
@@ -132,10 +132,9 @@ async fn parse_comments(json: &serde_json::Value) -> Vec<Comment> {
 
 	// For each comment, retrieve the values to build a Comment object
 	for comment in comment_data {
-		let unix_time: i64 = comment["data"]["created_utc"].as_f64().unwrap_or(0.0).round() as i64;
+		let unix_time = comment["data"]["created_utc"].as_f64().unwrap_or_default();
-		if unix_time == 0 {
+		if unix_time == 0.0 {	continue }
-			continue;
+		let (rel_time, created) = time(unix_time);
-		}
 
 		let score = comment["data"]["score"].as_i64().unwrap_or(0);
 		let body = rewrite_url(&val(&comment, "body_html"));
@@ -151,7 +150,8 @@ async fn parse_comments(json: &serde_json::Value) -> Vec<Comment> {
 			body,
 			author: val(&comment, "author"),
 			score: format_num(score),
-			time: OffsetDateTime::from_unix_timestamp(unix_time).format("%b %d %Y %H:%M UTC"),
+			rel_time,
+			created,
 			replies,
 			flair: Flair {
 				flair_parts: parse_rich_flair(

src/utils.rs

@@ -49,7 +49,8 @@ pub struct Post {
 	pub thumbnail: String,
 	pub media: String,
 	pub domain: String,
-	pub time: String,
+	pub rel_time: String,
+	pub created: String,
 }
 
 // Comment with content, post, score and data/time that it was posted
@@ -59,7 +60,8 @@ pub struct Comment {
 	pub author: String,
 	pub flair: Flair,
 	pub score: String,
-	pub time: String,
+	pub rel_time: String,
+	pub created: String,
 	pub replies: Vec<Comment>,
 }
 
@@ -240,11 +242,12 @@ pub fn parse_rich_flair(flair_type: String, rich_flair: Option<&Vec<Value>>, tex
 	}
 }
 
-pub fn time(unix_time: i64) -> String {
+pub fn time(created: f64) -> (String, String) {
-	let time = OffsetDateTime::from_unix_timestamp(unix_time);
+	let time = OffsetDateTime::from_unix_timestamp(created.round() as i64);
 	let time_delta = OffsetDateTime::now_utc() - time;
+
 	// If the time difference is more than a month, show full date
-	if time_delta > Duration::days(30) {
+	let rel_time = if time_delta > Duration::days(30) {
 		time.format("%b %d '%y")
 	// Otherwise, show relative date/time
 	} else if time_delta.whole_days() > 0 {
@@ -253,7 +256,9 @@ pub fn time(unix_time: i64) -> String {
 		format!("{}h ago", time_delta.whole_hours())
 	} else {
 		format!("{}m ago", time_delta.whole_minutes())
-	}
+	};
+
+	(rel_time, time.format("%b %d %Y %H:%M UTC"))
 }
 
 //
@@ -290,7 +295,7 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec<Post
 
 	// For each post from posts list
 	for post in post_list {
-		let unix_time: i64 = post["data"]["created_utc"].as_f64().unwrap_or_default().round() as i64;
+		let (rel_time, created) = time(post["data"]["created_utc"].as_f64().unwrap_or_default());
 		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");
@@ -337,7 +342,8 @@ 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: time(unix_time),
+			rel_time,
+			created
 		});
 	}
 

static/style.css

@@ -676,7 +676,7 @@ a.search_subreddit:hover {
 	padding: 5px;
 }
 
-.datetime {
+.created {
 	opacity: 0.5;
 }
 
@@ -901,7 +901,11 @@ td, th {
 		padding: 5px 0;
 	}
 
-	.datetime {
+	/* .comment_data::marker {
+		font-size: 18px;
+	} */
+
+	.created {
 		width: 100%;
 	}
 }

templates/post.html

@@ -25,7 +25,7 @@
 			{% if item.flair.flair_parts.len() > 0 %}
 				<small class="author_flair">{% call utils::render_flair(item.flair.flair_parts) %}</small>
 			{% endif %}
-			<span class="datetime">{{ item.time }}</span>
+			<span class="created" title="{{ post.created }}">{{ item.rel_time }}</span>
 		</summary>
 		<div class="comment_body">{{ item.body }}</div>
 {%- endmacro %}
@@ -54,7 +54,7 @@
 							<small class="author_flair">{% call utils::render_flair(post.author_flair.flair_parts) %}</small>
 						{% endif %}
 						<span class="dot">&bull;</span>
-						<span class="datetime">{{ post.time }}</span>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 					</p>
 					<a href="{{ post.permalink }}" class="post_title">
 						{{ post.title }}

templates/search.html

@@ -53,7 +53,7 @@
 							<small class="author_flair">{% call utils::render_flair(post.author_flair.flair_parts) %}</small>
 						{% endif %}
 						<span class="dot">&bull;</span>
-						<span class="datetime">{{ post.time }}</span>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 					</p>
 					<p class="post_title">
 						{% if post.flair.flair_parts.len() > 0 %}
@@ -89,7 +89,7 @@
 				<details class="comment_right" open>
 					<summary class="comment_data">
 						<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
-						<span class="datetime">{{ post.time }}</span>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 					</summary>
 					<p class="comment_body">{{ post.body }}</p>
 				</details>

templates/subreddit.html

@@ -44,7 +44,7 @@
 							<span class="dot">&bull;</span>
 							<a class="post_author" href="/u/{{ post.author }}">u/{{ post.author }}</a>
 							<span class="dot">&bull;</span>
-							<span class="datetime">{{ post.time }}</span>
+							<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 						</p>
 						<p class="post_title">
 							{% if post.flair.flair_parts.len() > 0 %}

templates/user.html

@@ -36,7 +36,7 @@
 							<small class="author_flair">{% call utils::render_flair(post.author_flair.flair_parts) %}</small>
 							{% endif %}
 							<span class="dot">&bull;</span>
-							<span class="datetime">{{ post.time }}</span>
+							<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 						</p>
 						<p class="post_title">
 							{% if post.flair.background_color == "Comment" %}
@@ -74,7 +74,7 @@
 				<details class="comment_right" open>
 					<summary class="comment_data">
 						<a class="comment_link" href="{{ post.permalink }}">COMMENT</a>
-						<span class="datetime">{{ post.time }}</span>
+						<span class="created" title="{{ post.created }}">{{ post.rel_time }}</span>
 					</summary>
 					<p class="comment_body">{{ post.body }}</p>
 				</details>