Sort Top by Timeframe

src/popular.rs

@@ -8,21 +8,23 @@ use askama::Template;
 #[template(path = "popular.html", escape = "none")]
 struct PopularTemplate {
 	posts: Vec<Post>,
-	sort: String,
+	sort: (String, String),
 	ends: (String, String),
 }
 
 // RENDER
-async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
+async fn render(sort: Option<String>, t: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
 	let sorting = sort.unwrap_or("hot".to_string());
 	let before = ends.1.clone().unwrap_or(String::new()); // If there is an after, there must be a before
 
+	let timeframe = match &t { Some(val) => format!("&t={}", val), None => String::new() };
+
 	// Build the Reddit JSON API url
 	let url = match ends.0 {
-		Some(val) => format!("r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
+		Some(val) => format!("r/popular/{}.json?before={}&count=25{}", sorting, val, timeframe),
 		None => match ends.1 {
-			Some(val) => format!("r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
-			None => format!("r/{}/{}.json", sub_name, sorting),
+			Some(val) => format!("r/popular/{}.json?after={}&count=25{}", sorting, val, timeframe),
+			None => format!("r/popular/{}.json?{}", sorting, timeframe),
 		},
 	};
 
@@ -40,7 +42,7 @@ async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, O
 
 		let s = PopularTemplate {
 			posts: items.0,
-			sort: sorting,
+			sort: (sorting, t.unwrap_or(String::new())),
 			ends: (before, items.1),
 		}
 		.render()
@@ -51,5 +53,5 @@ async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, O
 
 // SERVICES
 pub async fn page(params: web::Query<Params>) -> Result<HttpResponse> {
-	render("popular".to_string(), params.sort.clone(), (params.before.clone(), params.after.clone())).await
+	render(params.sort.clone(), params.t.clone(), (params.before.clone(), params.after.clone())).await
 }

src/subreddit.rs

@@ -10,26 +10,28 @@ use std::convert::TryInto;
 struct SubredditTemplate {
 	sub: Subreddit,
 	posts: Vec<Post>,
-	sort: String,
+	sort: (String, String),
 	ends: (String, String),
 }
 
 // SERVICES
 #[allow(dead_code)]
 pub async fn page(web::Path(sub): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-	render(sub, params.sort.clone(), (params.before.clone(), params.after.clone())).await
+	render(sub, params.sort.clone(), params.t.clone(), (params.before.clone(), params.after.clone())).await
 }
 
-pub async fn render(sub_name: String, sort: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
+pub async fn render(sub_name: String, sort: Option<String>, t: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
 	let sorting = sort.unwrap_or("hot".to_string());
 	let before = ends.1.clone().unwrap_or(String::new()); // If there is an after, there must be a before
 
+	let timeframe = match &t { Some(val) => format!("&t={}", val), None => String::new() };
+
 	// Build the Reddit JSON API url
 	let url = match ends.0 {
-		Some(val) => format!("r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
+		Some(val) => format!("r/{}/{}.json?before={}&count=25{}", sub_name, sorting, val, timeframe),
 		None => match ends.1 {
-			Some(val) => format!("r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
-			None => format!("r/{}/{}.json", sub_name, sorting),
+			Some(val) => format!("r/{}/{}.json?after={}&count=25{}", sub_name, sorting, val, timeframe),
+			None => format!("r/{}/{}.json?{}", sub_name, sorting, timeframe),
 		},
 	};
 
@@ -54,7 +56,7 @@ pub async fn render(sub_name: String, sort: Option<String>, ends: (Option<String
 		let s = SubredditTemplate {
 			sub: sub,
 			posts: items.0,
-			sort: sorting,
+			sort: (sorting, t.unwrap_or(String::new())),
 			ends: (before, items.1),
 		}
 		.render()

src/user.rs

@@ -10,21 +10,23 @@ use chrono::{TimeZone, Utc};
 struct UserTemplate {
 	user: User,
 	posts: Vec<Post>,
-	sort: String,
+	sort: (String, String),
 	ends: (String, String),
 }
 
-async fn render(username: String, sort: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
+async fn render(username: String, sort: Option<String>, t: Option<String>, ends: (Option<String>, Option<String>)) -> Result<HttpResponse> {
 	let sorting = sort.unwrap_or("new".to_string());
 
 	let before = ends.1.clone().unwrap_or(String::new()); // If there is an after, there must be a before
 
+	let timeframe = match &t { Some(val) => format!("&t={}", val), None => String::new() };
+
 	// Build the Reddit JSON API url
 	let url = match ends.0 {
-		Some(val) => format!("user/{}/.json?sort={}&before={}&count=25&raw_json=1", username, sorting, val),
+		Some(val) => format!("user/{}/.json?sort={}&before={}&count=25&raw_json=1{}", username, sorting, val, timeframe),
 		None => match ends.1 {
-			Some(val) => format!("user/{}/.json?sort={}&after={}&count=25&raw_json=1", username, sorting, val),
-			None => format!("user/{}/.json?sort={}&raw_json=1", username, sorting),
+			Some(val) => format!("user/{}/.json?sort={}&after={}&count=25&raw_json=1{}", username, sorting, val, timeframe),
+			None => format!("user/{}/.json?sort={}&raw_json=1{}", username, sorting, timeframe),
 		},
 	};
 
@@ -44,7 +46,7 @@ async fn render(username: String, sort: Option<String>, ends: (Option<String>, O
 		let s = UserTemplate {
 			user: user.unwrap(),
 			posts: posts_unwrapped.0,
-			sort: sorting,
+			sort: (sorting, t.unwrap_or(String::new())),
 			ends: (before, posts_unwrapped.1)
 		}
 		.render()
@@ -55,7 +57,7 @@ async fn render(username: String, sort: Option<String>, ends: (Option<String>, O
 
 // SERVICES
 pub async fn page(web::Path(username): web::Path<String>, params: web::Query<Params>) -> Result<HttpResponse> {
-	render(username, params.sort.clone(), (params.before.clone(), params.after.clone())).await
+	render(username, params.sort.clone(), params.t.clone(), (params.before.clone(), params.after.clone())).await
 }
 
 // USER

src/utils.rs

@@ -66,6 +66,7 @@ pub struct Subreddit {
 // Parser for query params, used in sorting (eg. /r/rust/?sort=hot)
 #[derive(serde::Deserialize)]
 pub struct Params {
+	pub t: Option<String>,
 	pub sort: Option<String>,
 	pub after: Option<String>,
 	pub before: Option<String>,