From 312d162c09f071ff603cc77880b8d73e56156870 Mon Sep 17 00:00:00 2001
From: Scoder12 <34356756+Scoder12@users.noreply.github.com>
Date: Mon, 7 Dec 2020 10:53:22 -0800
Subject: [PATCH] Fix mistakes

---
 src/subreddit.rs |  7 ++++---
 src/utils.rs     | 14 ++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/subreddit.rs b/src/subreddit.rs
index e430eba..859e642 100644
--- a/src/subreddit.rs
+++ b/src/subreddit.rs
@@ -1,7 +1,8 @@
 // CRATES
-use crate::utils::{fetch_posts, format_url, request, val, ErrorTemplate, Params, Post, Subreddit};
+use crate::utils::{fetch_posts, format_url, request, val, ErrorTemplate, Params, Post, Subreddit, format_num};
 use actix_web::{get, http::StatusCode, web, HttpResponse, Result};
 use askama::Template;
+use std::convert::TryInto;
 
 // STRUCTS
 #[derive(Template)]
@@ -89,8 +90,8 @@ async fn subreddit(sub: &String) -> Result<Subreddit, &'static str> {
 		title: val(&res, "title").await,
 		description: val(&res, "public_description").await,
 		icon: format_url(val(&res, "icon_img").await.as_str()).await,
-		members: format_num(members),
-		active: format_num(active),
+		members: format_num(members.try_into().unwrap()),
+		active: format_num(active.try_into().unwrap()),
 	};
 
 	Ok(sub)
diff --git a/src/utils.rs b/src/utils.rs
index 063e8a0..1657878 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -76,7 +76,7 @@ pub struct ErrorTemplate {
 }
 
 //
-// URL HANDLING
+// FORMATTING
 //
 
 pub async fn format_url(url: &str) -> String {
@@ -87,6 +87,10 @@ pub async fn format_url(url: &str) -> String {
 	return url.to_string();
 }
 
+pub fn format_num(num: i64) -> String {
+	return if num > 1000 { format!("{}k", num / 1000) } else { num.to_string() };
+}
+
 //
 // JSON PARSING
 //
@@ -136,7 +140,7 @@ pub async fn fetch_posts(url: String, fallback_title: String) -> Result<(Vec<Pos
 			community: val(post, "subreddit").await,
 			body: val(post, "body").await,
 			author: val(post, "author").await,
-			score: format_score(score),
+			score: format_num(score),
 			post_type: "link".to_string(),
 			media: img,
 			url: val(post, "permalink").await,
@@ -202,9 +206,3 @@ pub async fn request(url: String) -> Result<serde_json::Value, &'static str> {
 		Ok(json)
 	}
 }
-
-
-// FORMATTING
-pub fn format_num(num: i64) -> String {
-	return if num > 1000 { format!("{}k", num / 1000) } else { num.to_string() };
-}