From 6bbc90bc0d464911be277b4c2a9fbe592d9ce34a Mon Sep 17 00:00:00 2001
From: spikecodes <19519553+spikecodes@users.noreply.github.com>
Date: Mon, 11 Jan 2021 16:35:50 -0800
Subject: [PATCH] Clean Subreddit struct

---
 src/subreddit.rs | 6 ++++--
 src/utils.rs     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/subreddit.rs b/src/subreddit.rs
index 38240c9..ac0813b 100644
--- a/src/subreddit.rs
+++ b/src/subreddit.rs
@@ -37,8 +37,10 @@ pub async fn page(req: HttpRequest) -> HttpResponse {
 	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
+		Subreddit {
+			name: sub_name,
+			..Subreddit::default()
+		}
 	} else {
 		Subreddit::default()
 	};
diff --git a/src/utils.rs b/src/utils.rs
index c53fe67..e2ebb1e 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -170,7 +170,7 @@ pub async fn media(data: &serde_json::Value) -> (String, String) {
 	} else if data["post_hint"].as_str().unwrap_or("") == "image" {
 		post_type = "image";
 		format_url(data["preview"]["images"][0]["source"]["url"].as_str().unwrap_or_default().to_string())
-	} else if data["is_self"].as_bool().unwrap_or_default()  {
+	} else if data["is_self"].as_bool().unwrap_or_default() {
 		post_type = "self";
 		data["permalink"].as_str().unwrap_or_default().to_string()
 	} else {