From ef3820a2e17c626cc95d3acdf09be7a8d41ba690 Mon Sep 17 00:00:00 2001 From: spikecodes <19519553+spikecodes@users.noreply.github.com> Date: Sun, 20 Dec 2020 11:29:23 -0800 Subject: [PATCH] User Flairs --- Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 2 +- src/post.rs | 31 +++++++++++++++++++------------ src/utils.rs | 7 +++++++ static/style.css | 12 +++++++++++- templates/popular.html | 9 +++++---- templates/post.html | 12 +++++++++--- templates/subreddit.html | 9 +++++---- templates/user.html | 9 +++++---- 10 files changed, 64 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e446a02..40eb918 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1015,7 +1015,7 @@ checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" [[package]] name = "libreddit" -version = "0.2.0" +version = "0.2.1" dependencies = [ "actix-web", "askama", diff --git a/Cargo.toml b/Cargo.toml index 000f177..5d34c54 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.0" +version = "0.2.1" authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"] edition = "2018" diff --git a/README.md b/README.md index 7b320ab..12827fb 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ Libreddit hopes to provide an easier way to browse Reddit, without the ads, trac Libreddit currently implements most of Reddit's functionalities but still lacks a few features that are being worked on below. ### In Progress -- User flairs - Searching +- Multireddits ### How does it compare to Teddit? diff --git a/src/post.rs b/src/post.rs index 166162e..ab7835d 100644 --- a/src/post.rs +++ b/src/post.rs @@ -17,12 +17,15 @@ struct PostTemplate { sort: String, } -async fn render(id: String, sort: String) -> Result { +async fn render(id: String, sort: Option) -> Result { // Log the post ID being fetched dbg!(&id); + // Handling sort paramater + let sorting: String = sort.unwrap_or("confidence".to_string()); + // Build the Reddit JSON API url - let url: String = format!("https://reddit.com/{}.json?sort={}", id, sort); + let url: String = format!("https://reddit.com/{}.json?sort={}", id, sorting); // Send a request to the url, receive JSON in response let req = request(url).await; @@ -48,7 +51,7 @@ async fn render(id: String, sort: String) -> Result { let s = PostTemplate { comments: comments.unwrap(), post: post.unwrap(), - sort: sort, + sort: sorting, } .render() .unwrap(); @@ -57,17 +60,11 @@ async fn render(id: String, sort: String) -> Result { // SERVICES pub async fn short(web::Path(id): web::Path, params: web::Query) -> Result { - match ¶ms.sort { - Some(sort) => render(id, sort.to_string()).await, - None => render(id, "confidence".to_string()).await, - } + render(id, params.sort.clone()).await } pub async fn page(web::Path((_sub, id)): web::Path<(String, String)>, params: web::Query) -> Result { - match ¶ms.sort { - Some(sort) => render(id, sort.to_string()).await, - None => render(id, "confidence".to_string()).await, - } + render(id, params.sort.clone()).await } // UTILITIES @@ -118,6 +115,11 @@ async fn parse_post(json: serde_json::Value) -> Result { community: val(post_data, "subreddit").await, body: markdown_to_html(post_data["data"]["selftext"].as_str().unwrap()).await, author: val(post_data, "author").await, + author_flair: Flair( + val(post_data, "author_flair_text").await, + val(post_data, "author_flair_background_color").await, + val(post_data, "author_flair_text_color").await, + ), url: val(post_data, "permalink").await, score: format_num(score), post_type: media.0, @@ -131,7 +133,7 @@ async fn parse_post(json: serde_json::Value) -> Result { } else { "white".to_string() }, - ), + ) }; Ok(post) @@ -167,6 +169,11 @@ async fn parse_comments(json: serde_json::Value) -> Result, &'stati score: format_num(score), time: Utc.timestamp(unix_time, 0).format("%b %e %Y %H:%M UTC").to_string(), replies: replies, + flair: Flair( + val(comment, "author_flair_text").await, + val(comment, "author_flair_background_color").await, + val(comment, "author_flair_text_color").await, + ), }); } diff --git a/src/utils.rs b/src/utils.rs index d50fa07..17b228b 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -22,6 +22,7 @@ pub struct Post { pub community: String, pub body: String, pub author: String, + pub author_flair: Flair, pub url: String, pub score: String, pub post_type: String, @@ -35,6 +36,7 @@ pub struct Post { pub struct Comment { pub body: String, pub author: String, + pub flair: Flair, pub score: String, pub time: String, pub replies: Vec, @@ -147,6 +149,11 @@ pub async fn fetch_posts(url: String, fallback_title: String) -> Result<(Vec

r/{{ post.community }} - • - Posted by - u/{{ post.author }} + • u/{{ post.author }} + {% if post.author_flair.0 != "" %} + {{ post.author_flair.0 }} + {% endif %} {{ post.time }}

{% if post.flair.0 != "" %} - {{ post.flair.0 }} + {{ post.flair.0 }} {% endif %} {{ post.title }}

diff --git a/templates/post.html b/templates/post.html index c7eb2e7..b9b09c1 100644 --- a/templates/post.html +++ b/templates/post.html @@ -14,7 +14,11 @@
- u/{{ item.author }} • {{ item.time }} + u/{{ item.author }} + {% if item.flair.0 != "" %} + {{ item.flair.0 }} + {% endif %} + • {{ item.time }}

{{ item.body }}

@@ -29,14 +33,16 @@

r/{{ post.community }} • - Posted by u/{{ post.author }} + {% if post.author_flair.0 != "" %} + {{ post.author_flair.0 }} + {% endif %} {{ post.time }}

{{ post.title }} {% if post.flair.0 != "" %} - {{ post.flair.0 }} + {{ post.flair.0 }} {% endif %} {% if post.post_type == "image" %} diff --git a/templates/subreddit.html b/templates/subreddit.html index 36045e1..a18f86c 100644 --- a/templates/subreddit.html +++ b/templates/subreddit.html @@ -27,14 +27,15 @@

r/{{ sub.name }} - • - Posted by - u/{{ post.author }} + • u/{{ post.author }} + {% if post.author_flair.0 != "" %} + {{ post.author_flair.0 }} + {% endif %} {{ post.time }}

{% if post.flair.0 != "" %} - {{ post.flair.0 }} + {{ post.flair.0 }} {% endif %} {{ post.title }}

diff --git a/templates/user.html b/templates/user.html index c3bdafb..0c5edb2 100644 --- a/templates/user.html +++ b/templates/user.html @@ -27,16 +27,17 @@

r/{{ post.community }} - • - Posted by - u/{{ post.author }} + • u/{{ post.author }} + {% if post.author_flair.0 != "" %} + {{ post.author_flair.0 }} + {% endif %} {{ post.time }}

{% if post.flair.0 == "Comment" %} {% else if post.flair.0 == "" %} {% else %} - {{ post.flair.0 }} + {{ post.flair.0 }} {% endif %} {{ post.title }}