From bb8273bab42929ac177a2e9a091255c687f01897 Mon Sep 17 00:00:00 2001 From: spikecodes <19519553+spikecodes@users.noreply.github.com> Date: Mon, 11 Jan 2021 10:33:42 -0800 Subject: [PATCH] Fix #41 --- src/subreddit.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/subreddit.rs b/src/subreddit.rs index a092eeb..38240c9 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -34,8 +34,11 @@ pub async fn page(req: HttpRequest) -> HttpResponse { .to_string(); let sort = req.match_info().get("sort").unwrap_or("hot").to_string(); - let sub = if !&sub_name.contains('+') && sub_name != "popular" && sub_name != "all" { + let sub = if !sub_name.contains('+') && sub_name != "popular" && sub_name != "all" { subreddit(&sub_name).await.unwrap_or_default() + } else if sub_name.contains('+') { + let mut default = Subreddit::default(); + default.name = sub_name; default } else { Subreddit::default() }; @@ -60,7 +63,7 @@ pub async fn page(req: HttpRequest) -> HttpResponse { pub async fn wiki(req: HttpRequest) -> HttpResponse { let sub = req.match_info().get("sub").unwrap_or("reddit.com"); let page = req.match_info().get("page").unwrap_or("index"); - let path: String = format!("r/{}/wiki/{}.json?raw_json=1", sub, page); + let path: String = format!("/r/{}/wiki/{}.json?raw_json=1", sub, page); match request(&path).await { Ok(res) => {