Add pages to subreddits

src/popular.rs

@@ -16,21 +16,37 @@ use utils::Params;
 struct PopularTemplate {
 	posts: Vec<Post>,
 	sort: String,
+	ends: (String, String),
 }
 
 // RENDER
-async fn render(sub_name: String, sort: String) -> Result<HttpResponse> {
-	let posts: Vec<Post> = posts(sub_name, &sort).await?;
+async fn render(sub_name: String, sort: 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 s = PopularTemplate { posts: posts, sort: sort }.render().unwrap();
+	// Build the Reddit JSON API url
+	let url = match ends.0 {
+		Some(val) => format!("https://www.reddit.com/r/{}/{}.json?before={}&count=25", sub_name, sorting, val),
+		None => match ends.1 {
+			Some(val) => format!("https://www.reddit.com/r/{}/{}.json?after={}&count=25", sub_name, sorting, val),
+			None => format!("https://www.reddit.com/r/{}/{}.json", sub_name, sorting),
+		},
+	};
+
+	let items = posts(url).await?;
+
+	let s = PopularTemplate {
+		posts: items.0,
+		sort: sorting,
+		ends: (before, items.1),
+	}
+	.render()
+	.unwrap();
 	Ok(HttpResponse::Ok().content_type("text/html").body(s))
 }
 
 // SERVICES
 #[get("/")]
 pub async fn page(params: web::Query<Params>) -> Result<HttpResponse> {
-	match &params.sort {
-		Some(sort) => render("popular".to_string(), sort.to_string()).await,
-		None => render("popular".to_string(), "hot".to_string()).await,
-	}
+	render("popular".to_string(), params.sort.clone(), (params.before.clone(), params.after.clone())).await
 }