luckyimnotanigger/redlib
1
0
Fork 0
mirror of https://github.com/redlib-org/redlib.git synced 2025-05-14 14:02:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sort Top by Timeframe

Browse source
This commit is contained in:
spikecodes 2020-12-29 17:11:47 -08:00
parent 44c4341e67
commit f65ee2eb6a
8 changed files with 76 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/subreddit.rs
View file

@ -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()