From 8c80946121dadd685601265e2f45ef53aa0ed772 Mon Sep 17 00:00:00 2001 From: spikecodes <19519553+spikecodes@users.noreply.github.com> Date: Sat, 30 Jan 2021 20:24:09 -0800 Subject: [PATCH] Fix multireddit sidebars --- src/subreddit.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/subreddit.rs b/src/subreddit.rs index ebad6c9..dbd5f94 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -52,18 +52,19 @@ pub async fn page(req: HttpRequest) -> HttpResponse { let sub = if !sub.contains('+') && sub != subscribed && sub != "popular" && sub != "all" { // Regular subreddit subreddit(&sub).await.unwrap_or_default() + } else if sub == subscribed { + // Subscription feed + if req.path().starts_with("/r/") { + subreddit(&sub).await.unwrap_or_default() + } else { + Subreddit::default() + } } else if sub.contains('+') { // Multireddit Subreddit { name: sub, ..Subreddit::default() } - } else if sub == subscribed { - if req.path().starts_with("/r/") { - subreddit(&sub).await.unwrap_or_default() - } else { - Subreddit::default() - } } else { Subreddit::default() };