From 366bc17f97385ab6e6d38036c88c40cca19e85c1 Mon Sep 17 00:00:00 2001 From: Pim Date: Mon, 1 Jul 2024 23:15:50 +0200 Subject: [PATCH 001/128] feat: show post link title for comments on user page (#169) --- src/utils.rs | 3 +++ static/style.css | 20 +++++++++++++++++++- templates/user.html | 6 ++++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/utils.rs b/src/utils.rs index 52f81a3..ea0045d 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -298,6 +298,7 @@ pub struct Post { pub body: String, pub author: Author, pub permalink: String, + pub link_title: String, pub poll: Option, pub score: (String, String), pub upvote_ratio: i64, @@ -411,6 +412,7 @@ impl Post { stickied: data["stickied"].as_bool().unwrap_or_default() || data["pinned"].as_bool().unwrap_or_default(), }, permalink: val(post, "permalink"), + link_title: val(post, "link_title"), poll: Poll::parse(&data["poll_data"]), rel_time, created, @@ -715,6 +717,7 @@ pub async fn parse_post(post: &Value) -> Post { distinguished: val(post, "distinguished"), }, permalink, + link_title: val(post, "link_title"), poll, score: format_num(score), upvote_ratio: ratio as i64, diff --git a/static/style.css b/static/style.css index 05b4e4b..f7e8854 100644 --- a/static/style.css +++ b/static/style.css @@ -1255,10 +1255,28 @@ a.search_subreddit:hover { min-width: 0; } -.comment_data > * { +.comment:has([id]) .comment_data > * { margin-right: 5px; } +.comment:not([id]) .comment_data { + display: inline-flex; + max-width: 100%; +} + +.comment:not([id]) .comment_data > * { + flex: 0 0 auto; +} + +.comment:not([id]) .comment_data > .comment_link { + display: -webkit-box; + -webkit-line-clamp: 1; + -webkit-box-orient: vertical; + word-break: break-all; + overflow: hidden; + flex: 0 1 auto; +} + .comment_image { max-width: 500px; align-self: center; diff --git a/templates/user.html b/templates/user.html index 42019e7..35e58b2 100644 --- a/templates/user.html +++ b/templates/user.html @@ -63,8 +63,10 @@
- Comment on r/{{ post.community }} - {{ post.rel_time }} + {{ post.link_title }} +  in  + r/{{ post.community }} +  {{ post.rel_time }}

{{ post.body|safe }}

From 67a890cab30e899650d40aa5c3d5416d3958c723 Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Tue, 2 Jul 2024 08:04:27 -0400 Subject: [PATCH 002/128] fix(posts): fix sort call on new (#171) --- src/subreddit.rs | 4 ++++ src/utils.rs | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/subreddit.rs b/src/subreddit.rs index 0560e1b..8aea21b 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -145,6 +145,10 @@ pub async fn community(req: Request) -> Result, String> { let (_, all_posts_filtered) = filter_posts(&mut posts, &filters); let no_posts = posts.is_empty(); let all_posts_hidden_nsfw = !no_posts && (posts.iter().all(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on"); + if sort == "new" { + posts.sort_by(|a, b| b.created_ts.cmp(&a.created_ts)); + posts.sort_by(|a, b| b.flags.stickied.cmp(&a.flags.stickied)); + } Ok(template(&SubredditTemplate { sub, posts, diff --git a/src/utils.rs b/src/utils.rs index ea0045d..5e8d83c 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -425,8 +425,6 @@ impl Post { ws_url: val(post, "websocket_url"), }); } - posts.sort_by(|a, b| b.created_ts.cmp(&a.created_ts)); - posts.sort_by(|a, b| b.flags.stickied.cmp(&a.flags.stickied)); Ok((posts, res["data"]["after"].as_str().unwrap_or_default().to_string())) } } From 8a917fcde3f933107ad2899186d4026de6dd8114 Mon Sep 17 00:00:00 2001 From: Pim Date: Fri, 5 Jul 2024 03:32:12 +0200 Subject: [PATCH 003/128] feat: add download button on image/gif/video posts (#173) * feat: add download button on image/gif/video posts * chore: fix formatting * chore: dont create reference --- src/utils.rs | 43 +++++++++++++++++++++++++++++++++++++++++++ static/style.css | 9 +++++---- templates/utils.html | 27 ++++++++++++++++++++------- 3 files changed, 68 insertions(+), 11 deletions(-) diff --git a/src/utils.rs b/src/utils.rs index 5e8d83c..b11096f 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -169,6 +169,7 @@ pub struct Media { pub width: i64, pub height: i64, pub poster: String, + pub download_name: String, } impl Media { @@ -235,6 +236,15 @@ impl Media { let alt_url = alt_url_val.map_or(String::new(), |val| format_url(val.as_str().unwrap_or_default())); + let download_name = if post_type == "image" || post_type == "gif" || post_type == "video" { + let permalink_base = url_path_basename(data["permalink"].as_str().unwrap_or_default()); + let media_url_base = url_path_basename(url_val.as_str().unwrap_or_default()); + + format!("redlib_{permalink_base}_{media_url_base}") + } else { + String::new() + }; + ( post_type.to_string(), Self { @@ -245,6 +255,7 @@ impl Media { 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()), + download_name, }, gallery, ) @@ -389,6 +400,7 @@ impl Post { width: data["thumbnail_width"].as_i64().unwrap_or_default(), height: data["thumbnail_height"].as_i64().unwrap_or_default(), poster: String::new(), + download_name: String::new(), }, media, domain: val(post, "domain"), @@ -727,6 +739,7 @@ pub async fn parse_post(post: &Value) -> Post { width: post["data"]["thumbnail_width"].as_i64().unwrap_or_default(), height: post["data"]["thumbnail_height"].as_i64().unwrap_or_default(), poster: String::new(), + download_name: String::new(), }, flair: Flair { flair_parts: FlairPart::parse( @@ -1110,6 +1123,20 @@ pub async fn nsfw_landing(req: Request, req_url: String) -> Result String { + let url_result = Url::parse(format!("https://libredd.it/{path}").as_str()); + + if url_result.is_err() { + path.to_string() + } else { + let mut url = url_result.unwrap(); + url.path_segments_mut().unwrap().pop_if_empty(); + + url.path_segments().unwrap().last().unwrap().to_string() + } +} + #[cfg(test)] mod tests { use super::{format_num, format_url, rewrite_urls}; @@ -1218,3 +1245,19 @@ fn test_rewriting_image_links() { let output = r#"

caption 1
li.desktop_item { +.desktop_item { display: auto; } @media screen and (min-width: 481px) { - #post_links > li.mobile_item { + .mobile_item { display: none; } } @@ -1770,10 +1770,11 @@ td, th { } #post_links > li { margin-right: 10px } - #post_links > li.desktop_item { display: none } - #post_links > li.mobile_item { display: auto } .post_footer > p > span#upvoted { display: none } + .desktop_item { display: none } + .mobile_item { display: auto } + .popup { width: auto; } diff --git a/templates/utils.html b/templates/utils.html index 8edb55b..e1d317a 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -164,13 +164,28 @@ Upvotes

{{ post.upvote_ratio }}% Upvoted

@@ -178,8 +193,7 @@ {%- endmacro %} {% macro external_reddit_link(permalink) %} -{% for dev_type in ["desktop", "mobile"] %} -
  • +
  • -{% endfor %} {% endmacro %} {% macro post_in_list(post) -%} From 4f213886436423c935961b46d9da8388fa95fbfb Mon Sep 17 00:00:00 2001 From: Pim Date: Fri, 5 Jul 2024 22:33:06 +0200 Subject: [PATCH 004/128] fix: also use hls if possible for gifs in post_in_list macro (#177) --- templates/utils.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/utils.html b/templates/utils.html index e1d317a..c5ba45f 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -262,11 +262,7 @@ {% endif %} - {% else if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "gif" %} -
    - -
    - {% else if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "video" %} + {% else if (prefs.layout.is_empty() || prefs.layout == "card") && (post.post_type == "gif" || post.post_type == "video") %} {% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() %}