From f49bff98539b9264406df3096c38f076ffb774f5 Mon Sep 17 00:00:00 2001 From: spikecodes <19519553+spikecodes@users.noreply.github.com> Date: Sat, 2 Jan 2021 11:09:26 -0800 Subject: [PATCH] Optimize Sequencing --- Cargo.lock | 38 +++++++++++++++++++------------------- Cargo.toml | 2 +- src/post.rs | 10 +++++----- src/subreddit.rs | 6 +++--- src/user.rs | 2 +- src/utils.rs | 8 ++++---- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 900d853..59f8849 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,7 +93,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" dependencies = [ "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -267,7 +267,7 @@ checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -346,7 +346,7 @@ checksum = "e5444eec77a9ec2bfe4524139e09195862e981400c4358d3b760cae634e4c4ee" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -357,7 +357,7 @@ checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -562,7 +562,7 @@ checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -604,7 +604,7 @@ dependencies = [ "heck", "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -696,7 +696,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -1006,7 +1006,7 @@ checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" [[package]] name = "libreddit" -version = "0.2.4" +version = "0.2.5" dependencies = [ "actix-web", "askama", @@ -1264,7 +1264,7 @@ checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -1275,7 +1275,7 @@ checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -1564,7 +1564,7 @@ checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -1680,7 +1680,7 @@ dependencies = [ "quote 1.0.8", "serde", "serde_derive", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -1696,7 +1696,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -1718,9 +1718,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72" +checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", @@ -1744,7 +1744,7 @@ checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -1811,7 +1811,7 @@ dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", "standback", - "syn 1.0.56", + "syn 1.0.57", ] [[package]] @@ -2094,7 +2094,7 @@ dependencies = [ "log", "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", "wasm-bindgen-shared", ] @@ -2128,7 +2128,7 @@ checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.8", - "syn 1.0.56", + "syn 1.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 4a02b7c..c5bec1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "libreddit" description = " Alternative private front-end to Reddit" license = "AGPL-3.0" repository = "https://github.com/spikecodes/libreddit" -version = "0.2.4" +version = "0.2.5" authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"] edition = "2018" diff --git a/src/post.rs b/src/post.rs index ed12e3b..e3f35d5 100644 --- a/src/post.rs +++ b/src/post.rs @@ -47,13 +47,13 @@ async fn media(data: &serde_json::Value) -> (String, String) { let post_type: &str; let url = if !data["preview"]["reddit_video_preview"]["fallback_url"].is_null() { post_type = "video"; - format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap().to_string()).await + format_url(data["preview"]["reddit_video_preview"]["fallback_url"].as_str().unwrap().to_string()) } else if !data["secure_media"]["reddit_video"]["fallback_url"].is_null() { post_type = "video"; - format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap().to_string()).await + format_url(data["secure_media"]["reddit_video"]["fallback_url"].as_str().unwrap().to_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().to_string()).await + format_url(data["preview"]["images"][0]["source"]["url"].as_str().unwrap().to_string()) } else { post_type = "link"; data["url"].as_str().unwrap().to_string() @@ -79,7 +79,7 @@ async fn parse_post(json: &serde_json::Value) -> Result { let post = Post { title: val(post_data, "title"), community: val(post_data, "subreddit"), - body: rewrite_url(&val(post_data, "selftext_html")).await, + body: rewrite_url(&val(post_data, "selftext_html")), author: val(post_data, "author"), author_flair: Flair( val(post_data, "author_flair_text"), @@ -125,7 +125,7 @@ async fn parse_comments(json: &serde_json::Value) -> Result, &'stat } let score = comment["data"]["score"].as_i64().unwrap_or(0); - let body = rewrite_url(&val(comment, "body_html")).await; + let body = rewrite_url(&val(comment, "body_html")); let replies: Vec = if comment["data"]["replies"].is_object() { parse_comments(&comment["data"]["replies"]).await.unwrap_or_default() diff --git a/src/subreddit.rs b/src/subreddit.rs index 7cf00dc..6e77e45 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -58,7 +58,7 @@ pub async fn wiki(req: HttpRequest) -> Result { Ok(res) => { let s = WikiTemplate { sub: sub.to_string(), - wiki: rewrite_url(res["data"]["content_html"].as_str().unwrap()).await, + wiki: rewrite_url(res["data"]["content_html"].as_str().unwrap()), page: page.to_string(), } .render() @@ -90,8 +90,8 @@ async fn subreddit(sub: &str) -> Result { name: val(&res, "display_name"), title: val(&res, "title"), description: val(&res, "public_description"), - info: rewrite_url(&val(&res, "description_html").replace("\\", "")).await, - icon: format_url(icon).await, + info: rewrite_url(&val(&res, "description_html").replace("\\", "")), + icon: format_url(icon), members: format_num(members), active: format_num(active), wiki: res["data"]["wiki_enabled"].as_bool().unwrap_or_default(), diff --git a/src/user.rs b/src/user.rs index d3e0386..5183c8a 100644 --- a/src/user.rs +++ b/src/user.rs @@ -67,7 +67,7 @@ async fn user(name: &str) -> Result { Ok(User { name: name.to_string(), title: nested_val(&res, "subreddit", "title"), - icon: format_url(nested_val(&res, "subreddit", "icon_img")).await, + icon: format_url(nested_val(&res, "subreddit", "icon_img")), karma: res["data"]["total_karma"].as_i64().unwrap(), created: Utc.timestamp(created, 0).format("%b %e, %Y").to_string(), banner: nested_val(&res, "subreddit", "banner_img"), diff --git a/src/utils.rs b/src/utils.rs index 137804d..6121bf2 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -103,7 +103,7 @@ pub fn param(path: &str, value: &str) -> String { } // Direct urls to proxy if proxy is enabled -pub async fn format_url(url: String) -> String { +pub fn format_url(url: String) -> String { if url.is_empty() { return String::new(); }; @@ -116,7 +116,7 @@ pub async fn format_url(url: String) -> String { } // Rewrite Reddit links to Libreddit in body of text -pub async fn rewrite_url(text: &str) -> String { +pub fn rewrite_url(text: &str) -> String { let re = Regex::new(r#"href="(https://|http://|)(www.|)(reddit).(com)/"#).unwrap(); re.replace_all(text, r#"href="/"#).to_string() } @@ -171,7 +171,7 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec Result<(Vec