From be2a1d876b78b2f0cf81bba5a9e1173cff9c1f74 Mon Sep 17 00:00:00 2001
From: spikecodes <19519553+spikecodes@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:01:25 -0800
Subject: [PATCH] Fix url rewrites

---
 Cargo.lock   |  4 ++--
 src/utils.rs | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bbc60fc..1fc61b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1512,9 +1512,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
+checksum = "43535db9747a4ba938c0ce0a98cc631a46ebf943c9e1d604e091df6007620bf6"
 dependencies = [
  "itoa",
  "ryu",
diff --git a/src/utils.rs b/src/utils.rs
index e7a0f55..a11e18f 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -123,7 +123,7 @@ impl Media {
 		(
 			post_type.to_string(),
 			Self {
-				url: url.as_str().unwrap_or_default().to_string(),
+				url: format_url(url.as_str().unwrap_or_default()).to_string(),
 				width: source["width"].as_i64().unwrap_or_default(),
 				height: source["height"].as_i64().unwrap_or_default(),
 				poster: format_url(source["url"].as_str().unwrap_or_default()),
@@ -222,6 +222,7 @@ impl Post {
 
 			// Determine the type of media along with the media URL
 			let (post_type, media, gallery) = Media::parse(&data).await;
+			dbg!(&media.url);
 
 			posts.push(Self {
 				id: val(post, "id"),
@@ -539,10 +540,12 @@ pub async fn request(path: String) -> Result<Value, String> {
 							Err(
 								json["reason"]
 									.as_str()
-									.unwrap_or(json["message"].as_str().unwrap_or_else(|| {
-										println!("{} - Error parsing reddit error", url);
-										"Error parsing reddit error"
-									}))
+									.unwrap_or_else(|| {
+										json["message"].as_str().unwrap_or_else(|| {
+											println!("{} - Error parsing reddit error", url);
+											"Error parsing reddit error"
+										})
+									})
 									.to_string(),
 							)
 						} else {