From 045a8852ecb5ecf77b14471c0af66b4596139338 Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 29 May 2024 20:47:44 -0400 Subject: [PATCH 001/172] fix workflow --- .github/workflows/main-rust.yml | 10 +++++----- .replit | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main-rust.yml b/.github/workflows/main-rust.yml index 44476a1..0d96cfd 100644 --- a/.github/workflows/main-rust.yml +++ b/.github/workflows/main-rust.yml @@ -32,7 +32,7 @@ jobs: # Building actions - name: Build - run: RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-gnu + run: RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-musl - name: Versions id: version @@ -45,17 +45,17 @@ jobs: run: cargo publish --no-verify --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - name: Calculate SHA512 checksum - run: sha512sum target/x86_64-unknown-linux-gnu/release/redlib > redlib.sha512 + run: sha512sum target/x86_64-unknown-linux-musl/release/redlib > redlib.sha512 - name: Calculate SHA256 checksum - run: sha256sum target/x86_64-unknown-linux-gnu/release/redlib > redlib.sha256 + run: sha256sum target/x86_64-unknown-linux-musl/release/redlib > redlib.sha256 - uses: actions/upload-artifact@v3 name: Upload a Build Artifact with: name: redlib path: | - target/x86_64-unknown-linux-gnu/release/redlib + target/x86_64-unknown-linux-musl/release/redlib redlib.sha512 redlib.sha256 @@ -68,7 +68,7 @@ jobs: name: ${{ steps.version.outputs.VERSION }} - ${{ github.event.head_commit.message }} draft: true files: | - target/x86_64-unknown-linux-gnu/release/redlib + target/x86_64-unknown-linux-musl/release/redlib redlib.sha512 redlib.sha256 body: | diff --git a/.replit b/.replit index e973713..b857cc1 100644 --- a/.replit +++ b/.replit @@ -1,2 +1,2 @@ -run = "while :; do set -ex; nix-env -iA nixpkgs.unzip; curl -o./redlib.zip -fsSL -- https://nightly.link/redlib-org/redlib/workflows/main-rust/main/redlib.zip; unzip -n redlib.zip; mv target/x86_64-unknown-linux-gnu/release/redlib .; chmod +x redlib; set +e; ./redlib -H 63115200; sleep 1; done" +run = "while :; do set -ex; nix-env -iA nixpkgs.unzip; curl -o./redlib.zip -fsSL -- https://nightly.link/redlib-org/redlib/workflows/main-rust/main/redlib.zip; unzip -n redlib.zip; mv target/x86_64-unknown-linux-musl/release/redlib .; chmod +x redlib; set +e; ./redlib -H 63115200; sleep 1; done" language = "bash" From 96a7e155c5da4d4484ae2c04ca0f8a3bb1a0c8e5 Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 29 May 2024 20:49:29 -0400 Subject: [PATCH 002/172] v0.33.3 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fefc638..6fd2be0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1032,7 +1032,7 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "redlib" -version = "0.33.2" +version = "0.33.3" dependencies = [ "askama", "base64", diff --git a/Cargo.toml b/Cargo.toml index de9b410..081ad57 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "redlib" description = " Alternative private front-end to Reddit" license = "AGPL-3.0" repository = "https://github.com/redlib-org/redlib" -version = "0.33.2" +version = "0.33.3" authors = [ "Matthew Esposito ", "spikecodes <19519553+spikecodes@users.noreply.github.com>", From 31d68afdc942b062ab80d51e8419988102e47f76 Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 29 May 2024 20:50:38 -0400 Subject: [PATCH 003/172] fix workflow --- .github/workflows/main-rust.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main-rust.yml b/.github/workflows/main-rust.yml index 0d96cfd..0fb4ef9 100644 --- a/.github/workflows/main-rust.yml +++ b/.github/workflows/main-rust.yml @@ -30,6 +30,9 @@ jobs: with: toolchain: stable + - name: Install cargo musl target + run: rustup target add x86_64-unknown-linux-musl + # Building actions - name: Build run: RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-musl From 4ea911e6b2a6ed3fca2a44ea83013ed0cd5b43c7 Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 29 May 2024 20:51:39 -0400 Subject: [PATCH 004/172] fix workflow again --- .github/workflows/main-rust.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main-rust.yml b/.github/workflows/main-rust.yml index 0fb4ef9..ea44565 100644 --- a/.github/workflows/main-rust.yml +++ b/.github/workflows/main-rust.yml @@ -30,6 +30,9 @@ jobs: with: toolchain: stable + - name: Install musl-gcc + run: sudo apt-get install musl-tools + - name: Install cargo musl target run: rustup target add x86_64-unknown-linux-musl From 7a099f259fb5839cd0b5928876c2d22841d505dc Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 29 May 2024 20:59:27 -0400 Subject: [PATCH 005/172] v0.34.0 --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6fd2be0..70008cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1032,7 +1032,7 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "redlib" -version = "0.33.3" +version = "0.34.0" dependencies = [ "askama", "base64", diff --git a/Cargo.toml b/Cargo.toml index 081ad57..e33560e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "redlib" description = " Alternative private front-end to Reddit" license = "AGPL-3.0" repository = "https://github.com/redlib-org/redlib" -version = "0.33.3" +version = "0.34.0" authors = [ "Matthew Esposito ", "spikecodes <19519553+spikecodes@users.noreply.github.com>", From bd47c206a1d94c8382570b69730d72562d777454 Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Thu, 30 May 2024 18:08:45 -0400 Subject: [PATCH 006/172] fix(oauth): Make Android user-agent patching unconditional --- src/client.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/client.rs b/src/client.rs index 5b8fe8f..5ea9d1c 100644 --- a/src/client.rs +++ b/src/client.rs @@ -181,11 +181,12 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo ) }; - // Check if multi sub requested, or if submitted was requested. If so, replace "Android" with a tricky word. + // Replace "Android" with a tricky word. // Issues: #78/#115, #116 - if path.contains('+') || path.contains("/submitted") { - user_agent = user_agent.replace("Android", "Andr\u{200B}oid"); - } + // If you include the word "Android", you will get a number of different errors + // I guess they don't expect mobile traffic on the endpoints we use + // Scrawled on wall for next poor soul: Run the test suite. + user_agent = user_agent.replace("Android", "Andr\u{200B}oid"); // Build request to Reddit. When making a GET, request gzip compression. // (Reddit doesn't do brotli yet.) From 17c7738d6ea776f40f3ecdb12f1fbc08c0b9cf54 Mon Sep 17 00:00:00 2001 From: Ben Sherman Date: Thu, 30 May 2024 20:40:16 -0700 Subject: [PATCH 007/172] Properly apply REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY This change fixes the REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY environment variable being ignored. --- src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.rs b/src/config.rs index c7ebb58..e345537 100644 --- a/src/config.rs +++ b/src/config.rs @@ -156,7 +156,7 @@ fn get_setting_from_config(name: &str, config: &Config) -> Option { "REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION" => config.default_hide_hls_notification.clone(), "REDLIB_DEFAULT_WIDE" => config.default_wide.clone(), "REDLIB_DEFAULT_HIDE_AWARDS" => config.default_hide_awards.clone(), - "REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY" => config.default_hide_awards.clone(), + "REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY" => config.default_hide_sidebar_and_summary.clone(), "REDLIB_DEFAULT_HIDE_SCORE" => config.default_hide_score.clone(), "REDLIB_DEFAULT_SUBSCRIPTIONS" => config.default_subscriptions.clone(), "REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION" => config.default_disable_visit_reddit_confirmation.clone(), From 190c92339ea58dd2047f2b56218c6cd522f3a15d Mon Sep 17 00:00:00 2001 From: Harm133 Date: Fri, 31 May 2024 10:19:44 +0200 Subject: [PATCH 008/172] Update build-artifacts.yaml Only build artifacts on published release --- .github/workflows/build-artifacts.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yaml b/.github/workflows/build-artifacts.yaml index 57632ef..695d1bf 100644 --- a/.github/workflows/build-artifacts.yaml +++ b/.github/workflows/build-artifacts.yaml @@ -7,6 +7,8 @@ on: - "compose.*" branches: - "main" + release: + types: [published] env: CARGO_TERM_COLOR: always @@ -60,7 +62,6 @@ jobs: - name: Upload release uses: softprops/action-gh-release@v1 - if: github.base_ref != 'main' && github.event_name == 'release' with: tag_name: ${{ steps.version.outputs.VERSION }} name: ${{ steps.version.outputs.VERSION }} - ${{ github.event.head_commit.message }} From 3caa0592f33012f64de61b2da67961385bc9f9fd Mon Sep 17 00:00:00 2001 From: Pim Date: Fri, 31 May 2024 11:40:01 +0200 Subject: [PATCH 009/172] fix: healthcheck in Dockerfile Fix typo causing wget to return a warning: ``` # wget --q wget: option '--q' is ambiguous; possibilities: '--quiet' '--quota' ``` --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9412565..314a784 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ USER redlib EXPOSE 8080 # Run a healthcheck every minute to make sure redlib is functional -HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider --q http://localhost:8080/settings || exit 1 +HEALTHCHECK --interval=1m --timeout=3s CMD wget --spider -q http://localhost:8080/settings || exit 1 CMD ["redlib"] From ec11a5511b7702563635eb2b5617ade200c3673e Mon Sep 17 00:00:00 2001 From: Arul Agrawal Date: Fri, 31 May 2024 17:04:43 +0400 Subject: [PATCH 010/172] add nix flake --- .envrc | 1 + .gitignore | 4 ++ flake.lock | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 71 +++++++++++++++++++++++++++++++++++ 4 files changed, 182 insertions(+) create mode 100644 .envrc create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index 323a69d..a8d371a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ .env # Idea Files .idea/ + +# nix files +.direnv/ +result diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..4569244 --- /dev/null +++ b/flake.lock @@ -0,0 +1,106 @@ +{ + "nodes": { + "crane": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717121863, + "narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..8bcacf6 --- /dev/null +++ b/flake.nix @@ -0,0 +1,71 @@ +{ + description = "Redlib: Private front-end for Reddit"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + + crane = { + url = "github:ipetkov/crane"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + flake-utils.url = "github:numtide/flake-utils"; + + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + }; + + outputs = { nixpkgs, crane, flake-utils, rust-overlay, ... }: + flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ (import rust-overlay) ]; + }; + + inherit (pkgs) lib; + + rustToolchain = pkgs.rust-bin.stable.latest.default.override { + targets = [ "x86_64-unknown-linux-musl" ]; + }; + + craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; + + + src = lib.cleanSourceWith { + src = craneLib.path ./.; + filter = path: type: + (lib.hasInfix "/templates/" path) || + (lib.hasInfix "/static/" path) || + (craneLib.filterCargoSources path type); + }; + + redlib = craneLib.buildPackage { + inherit src; + strictDeps = true; + doCheck = false; + + CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl"; + CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static"; + }; + in + { + checks = { + my-crate = redlib; + }; + + packages.default = redlib; + packages.docker = pkgs.dockerTools.buildImage { + name = "quay.io/redlib/redlib"; + tag = "latest"; + created = "now"; + copyToRoot = with pkgs.dockerTools; [ caCertificates fakeNss ]; + config.Cmd = "${redlib}/bin/redlib"; + }; + }); +} From 8ece7562ec1927e76cfaef918d30646c1cbce26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89li=20Marshal?= <835958+EMarshal@users.noreply.github.com> Date: Sun, 2 Jun 2024 18:45:49 -0600 Subject: [PATCH 011/172] Remove obsolete references to latest-arm and latest-armv7 images --- README.md | 6 ------ compose.yaml | 2 -- 2 files changed, 8 deletions(-) diff --git a/README.md b/README.md index 4b945ad..1773858 100644 --- a/README.md +++ b/README.md @@ -203,12 +203,6 @@ docker logs -f redlib ### Docker CLI -> [!IMPORTANT] -> If deploying on: -> -> - an `arm64` platform, use the `quay.io/redlib/redlib:latest-arm` image instead. -> - an `armv7` platform, use the `quay.io/redlib/redlib:latest-armv7` image instead. - Deploy Redlib: ```bash diff --git a/compose.yaml b/compose.yaml index 493e37e..4260d65 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,8 +1,6 @@ services: redlib: image: quay.io/redlib/redlib:latest - # image: quay.io/redlib/redlib:latest-arm # uncomment if you use arm64 - # image: quay.io/redlib/redlib:latest-armv7 # uncomment if you use armv7 restart: always container_name: "redlib" ports: From 7fa37e48d5220414f9845cc5cb01f46818a5e338 Mon Sep 17 00:00:00 2001 From: Sangeeth Sudheer Date: Tue, 11 Jun 2024 21:16:44 +0530 Subject: [PATCH 012/172] Add font-weight range in @font-face rule This makes Safari render the bold weights correctly which otherwise looks wrong. --- static/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/style.css b/static/style.css index 98c968e..7cef37c 100644 --- a/static/style.css +++ b/static/style.css @@ -34,6 +34,7 @@ font-family: 'Inter'; src: url('/Inter.var.woff2') format('woff2-variations'); font-style: normal; + font-weight: 100 900; } /* Automatic theme selection */ From 30944579d7ceb8eaef5d4e94395df5c3032285ab Mon Sep 17 00:00:00 2001 From: nieve Date: Tue, 18 Jun 2024 00:21:00 -0400 Subject: [PATCH 013/172] add default filter config --- .env.example | 1 + app.json | 3 +++ src/config.rs | 12 ++++++++++++ src/instance_info.rs | 5 ++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index b74e45c..d8d08ee 100644 --- a/.env.example +++ b/.env.example @@ -36,6 +36,7 @@ REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION=off REDLIB_DEFAULT_AUTOPLAY_VIDEOS=off # Define a default list of subreddit subscriptions (format: sub1+sub2+sub3) REDLIB_DEFAULT_SUBSCRIPTIONS= +REDLIB_DEFAULT_FILTERS= # Hide awards by default REDLIB_DEFAULT_HIDE_AWARDS=off # Hide sidebar and summary diff --git a/app.json b/app.json index e1ae650..b3e8616 100644 --- a/app.json +++ b/app.json @@ -59,6 +59,9 @@ "REDLIB_DEFAULT_SUBSCRIPTIONS": { "required": false }, + "REDLIB_DEFAULT_FILTERS": { + "required": false + }, "REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION": { "required": false }, diff --git a/src/config.rs b/src/config.rs index e345537..eea1ddf 100644 --- a/src/config.rs +++ b/src/config.rs @@ -79,6 +79,10 @@ pub struct Config { #[serde(rename = "REDLIB_DEFAULT_SUBSCRIPTIONS")] #[serde(alias = "LIBREDDIT_DEFAULT_SUBSCRIPTIONS")] pub(crate) default_subscriptions: Option, + + #[serde(rename = "REDLIB_DEFAULT_FILTERS")] + #[serde(alias = "LIBREDDIT_DEFAULT_FILTERS")] + pub(crate) default_filters: Option, #[serde(rename = "REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION")] #[serde(alias = "LIBREDDIT_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION")] @@ -134,6 +138,7 @@ impl Config { default_hide_sidebar_and_summary: parse("REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY"), default_hide_score: parse("REDLIB_DEFAULT_HIDE_SCORE"), default_subscriptions: parse("REDLIB_DEFAULT_SUBSCRIPTIONS"), + default_filters: parse("REDLIB_DEFAULT_FILTERS"), default_disable_visit_reddit_confirmation: parse("REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION"), banner: parse("REDLIB_BANNER"), robots_disable_indexing: parse("REDLIB_ROBOTS_DISABLE_INDEXING"), @@ -159,6 +164,7 @@ fn get_setting_from_config(name: &str, config: &Config) -> Option { "REDLIB_DEFAULT_HIDE_SIDEBAR_AND_SUMMARY" => config.default_hide_sidebar_and_summary.clone(), "REDLIB_DEFAULT_HIDE_SCORE" => config.default_hide_score.clone(), "REDLIB_DEFAULT_SUBSCRIPTIONS" => config.default_subscriptions.clone(), + "REDLIB_DEFAULT_FILTERS" => config.default_filters.clone(), "REDLIB_DEFAULT_DISABLE_VISIT_REDDIT_CONFIRMATION" => config.default_disable_visit_reddit_confirmation.clone(), "REDLIB_BANNER" => config.banner.clone(), "REDLIB_ROBOTS_DISABLE_INDEXING" => config.robots_disable_indexing.clone(), @@ -231,6 +237,12 @@ fn test_default_subscriptions() { assert_eq!(get_setting("REDLIB_DEFAULT_SUBSCRIPTIONS"), Some("news+bestof".into())); } +#[test] +#[sealed_test(env = [("REDLIB_DEFAULT_FILTERS", "news+bestof")])] +fn test_default_filters() { + assert_eq!(get_setting("REDLIB_DEFAULT_FILTERS"), Some("news+bestof".into())); +} + #[test] #[sealed_test] fn test_pushshift() { diff --git a/src/instance_info.rs b/src/instance_info.rs index 462e09c..85c4883 100644 --- a/src/instance_info.rs +++ b/src/instance_info.rs @@ -146,6 +146,7 @@ impl InstanceInfo { ["Use HLS", &convert(&self.config.default_use_hls)], ["Hide HLS notification", &convert(&self.config.default_hide_hls_notification)], ["Subscriptions", &convert(&self.config.default_subscriptions)], + ["Filters", &convert(&self.config.default_filters)], ]) .with_header_row(["Default preferences"]), ); @@ -177,7 +178,8 @@ impl InstanceInfo { Default blur NSFW: {:?}\n Default use HLS: {:?}\n Default hide HLS notification: {:?}\n - Default subscriptions: {:?}\n", + Default subscriptions: {:?}\n + Default filters: {:?}\n", self.package_name, self.crate_version, self.git_commit, @@ -200,6 +202,7 @@ impl InstanceInfo { self.config.default_use_hls, self.config.default_hide_hls_notification, self.config.default_subscriptions, + self.config.default_filters, ) } StringType::Html => self.to_table(), From 1408c32a4dfd338978601dfe793a1f7aea48f411 Mon Sep 17 00:00:00 2001 From: nieve Date: Tue, 18 Jun 2024 00:25:29 -0400 Subject: [PATCH 014/172] Update .env.example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index d8d08ee..5e187f9 100644 --- a/.env.example +++ b/.env.example @@ -36,6 +36,7 @@ REDLIB_DEFAULT_HIDE_HLS_NOTIFICATION=off REDLIB_DEFAULT_AUTOPLAY_VIDEOS=off # Define a default list of subreddit subscriptions (format: sub1+sub2+sub3) REDLIB_DEFAULT_SUBSCRIPTIONS= +# Define a default list of subreddit filters (format: sub1+sub2+sub3) REDLIB_DEFAULT_FILTERS= # Hide awards by default REDLIB_DEFAULT_HIDE_AWARDS=off From 3491e754ac44bef07f3b9ad7c491918e4cb61556 Mon Sep 17 00:00:00 2001 From: nieve Date: Tue, 18 Jun 2024 00:30:53 -0400 Subject: [PATCH 015/172] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a8d371a..6ca325c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /target .env +redlib.toml + # Idea Files .idea/ From 91975865b88faa578d12481457778fedd26be630 Mon Sep 17 00:00:00 2001 From: Alessandro Pizzorni Date: Wed, 19 Jun 2024 00:42:38 +0200 Subject: [PATCH 016/172] Make server listen on both IPv6 and IPv4 by default --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index ee2da5a..3eccc30 100644 --- a/src/main.rs +++ b/src/main.rs @@ -135,7 +135,7 @@ async fn main() { .long("address") .value_name("ADDRESS") .help("Sets address to listen on") - .default_value("0.0.0.0") + .default_value("[::]") .num_args(1), ) .arg( From 5a13b9892b37e5041224fc773501af7cc6dda37a Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 19 Jun 2024 14:28:48 -0400 Subject: [PATCH 017/172] chore(clippy): add lint --- src/utils.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils.rs b/src/utils.rs index dbaf1de..05a7f7b 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,3 +1,4 @@ +#![allow(dead_code)] use crate::config::get_setting; // // CRATES From 997cd8f829f8be18d4fe051b19d318cf53df7cb3 Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 19 Jun 2024 14:45:32 -0400 Subject: [PATCH 018/172] feat(bug): Improve bug reporting while keeping logs private --- src/client.rs | 12 ++++++------ src/utils.rs | 2 +- templates/error.html | 16 ++++++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/client.rs b/src/client.rs index 5ea9d1c..34934a8 100644 --- a/src/client.rs +++ b/src/client.rs @@ -314,9 +314,9 @@ fn request(method: &'static Method, path: String, redirect: bool, quarantine: bo #[cached(size = 100, time = 30, result = true)] pub async fn json(path: String, quarantine: bool) -> Result { // Closure to quickly build errors - let err = |msg: &str, e: String| -> Result { + let err = |msg: &str, e: String, path: String| -> Result { // eprintln!("{} - {}: {}", url, msg, e); - Err(format!("{msg}: {e}")) + Err(format!("{msg}: {e} | {path}")) }; // Fetch the url... @@ -339,7 +339,7 @@ pub async fn json(path: String, quarantine: bool) -> Result { let () = force_refresh_token().await; return Err("OAuth token has expired. Please refresh the page!".to_string()); } - Err(format!("Reddit error {} \"{}\": {}", json["error"], json["reason"], json["message"])) + Err(format!("Reddit error {} \"{}\": {} | {path}", json["error"], json["reason"], json["message"])) } else { Ok(json) } @@ -349,15 +349,15 @@ pub async fn json(path: String, quarantine: bool) -> Result { if status.is_server_error() { Err("Reddit is having issues, check if there's an outage".to_string()) } else { - err("Failed to parse page JSON data", e.to_string()) + err("Failed to parse page JSON data", e.to_string(), path) } } } } - Err(e) => err("Failed receiving body from Reddit", e.to_string()), + Err(e) => err("Failed receiving body from Reddit", e.to_string(), path), } } - Err(e) => err("Couldn't send request to Reddit", e), + Err(e) => err("Couldn't send request to Reddit", e, path), } } diff --git a/src/utils.rs b/src/utils.rs index 05a7f7b..ff75a06 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1029,7 +1029,7 @@ pub fn redirect(path: &str) -> Response { /// Renders a generic error landing page. pub async fn error(req: Request, msg: &str) -> Result, String> { - error!("Error page rendered: {msg}"); + error!("Error page rendered: {}", msg.split("|").next().unwrap_or_default()); let url = req.uri().to_string(); let body = ErrorTemplate { msg: msg.to_string(), diff --git a/templates/error.html b/templates/error.html index a16fc74..e831200 100644 --- a/templates/error.html +++ b/templates/error.html @@ -2,10 +2,14 @@ {% block title %}Error: {{ msg }}{% endblock %} {% block sortstyle %}{% endblock %} {% block content %} -
-

{{ msg }}

-

Reddit Status

-
-

Head back home?

-
+
+

{{ msg }}

+

Reddit Status

+
+

Expected something to work? Report + an issue

+
+

Head back home?

+
{% endblock %} \ No newline at end of file From 9013e589dd67443c4267b8be58286f5c4ea2790a Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Wed, 19 Jun 2024 14:45:55 -0400 Subject: [PATCH 019/172] chore(clippy): fix lint --- src/utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.rs b/src/utils.rs index ff75a06..f44d037 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1029,7 +1029,7 @@ pub fn redirect(path: &str) -> Response { /// Renders a generic error landing page. pub async fn error(req: Request, msg: &str) -> Result, String> { - error!("Error page rendered: {}", msg.split("|").next().unwrap_or_default()); + error!("Error page rendered: {}", msg.split('|').next().unwrap_or_default()); let url = req.uri().to_string(); let body = ErrorTemplate { msg: msg.to_string(), From f460895cc04a1346fcafc0a4a8cb9bd879c1d01f Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Thu, 20 Jun 2024 07:56:43 -0400 Subject: [PATCH 020/172] chore(clippy): fix lint --- src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.rs b/src/config.rs index eea1ddf..a787251 100644 --- a/src/config.rs +++ b/src/config.rs @@ -79,7 +79,7 @@ pub struct Config { #[serde(rename = "REDLIB_DEFAULT_SUBSCRIPTIONS")] #[serde(alias = "LIBREDDIT_DEFAULT_SUBSCRIPTIONS")] pub(crate) default_subscriptions: Option, - + #[serde(rename = "REDLIB_DEFAULT_FILTERS")] #[serde(alias = "LIBREDDIT_DEFAULT_FILTERS")] pub(crate) default_filters: Option, From 3301da1ef1e71866a367f27e1deb58006fc04eca Mon Sep 17 00:00:00 2001 From: pimlie Date: Sat, 22 Jun 2024 12:16:12 +0200 Subject: [PATCH 021/172] feat: add support to blur spoiler previews --- .env.example | 2 ++ README.md | 1 + app.json | 3 +++ contrib/redlib.conf | 1 + src/config.rs | 6 ++++++ src/instance_info.rs | 3 +++ src/settings.rs | 3 ++- src/utils.rs | 5 +++++ templates/settings.html | 5 +++++ templates/utils.html | 11 ++++++----- 10 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 5e187f9..5e60b08 100644 --- a/.env.example +++ b/.env.example @@ -24,6 +24,8 @@ REDLIB_DEFAULT_WIDE=off REDLIB_DEFAULT_POST_SORT=hot # Set the default comment sort method (options: confidence, top, new, controversial, old) REDLIB_DEFAULT_COMMENT_SORT=confidence +# Enable blurring Spoiler content by default +REDLIB_DEFAULT_BLUR_SPOILER=off # Enable showing NSFW content by default REDLIB_DEFAULT_SHOW_NSFW=off # Enable blurring NSFW content by default diff --git a/README.md b/README.md index 1773858..533b628 100644 --- a/README.md +++ b/README.md @@ -394,6 +394,7 @@ Assign a default value for each user-modifiable setting by passing environment v | `WIDE` | `["on", "off"]` | `off` | | `POST_SORT` | `["hot", "new", "top", "rising", "controversial"]` | `hot` | | `COMMENT_SORT` | `["confidence", "top", "new", "controversial", "old"]` | `confidence` | +| `BLUR_SPOILER` | `["on", "off"]` | `off` | | `SHOW_NSFW` | `["on", "off"]` | `off` | | `BLUR_NSFW` | `["on", "off"]` | `off` | | `USE_HLS` | `["on", "off"]` | `off` | diff --git a/app.json b/app.json index b3e8616..d73780c 100644 --- a/app.json +++ b/app.json @@ -29,6 +29,9 @@ "REDLIB_DEFAULT_POST_SORT": { "required": false }, + "REDLIB_DEFAULT_BLUR_SPOILER": { + "required": false + }, "REDLIB_DEFAULT_SHOW_NSFW": { "required": false }, diff --git a/contrib/redlib.conf b/contrib/redlib.conf index 880bc7a..43c1d86 100644 --- a/contrib/redlib.conf +++ b/contrib/redlib.conf @@ -6,6 +6,7 @@ PORT=12345 #REDLIB_DEFAULT_WIDE=off #REDLIB_DEFAULT_POST_SORT=hot #REDLIB_DEFAULT_COMMENT_SORT=confidence +#REDLIB_DEFAULT_BLUR_SPOILER=off #REDLIB_DEFAULT_SHOW_NSFW=off #REDLIB_DEFAULT_BLUR_NSFW=off #REDLIB_DEFAULT_USE_HLS=off diff --git a/src/config.rs b/src/config.rs index a787251..2b8c752 100644 --- a/src/config.rs +++ b/src/config.rs @@ -48,6 +48,10 @@ pub struct Config { #[serde(alias = "LIBREDDIT_DEFAULT_POST_SORT")] pub(crate) default_post_sort: Option, + #[serde(rename = "REDLIB_DEFAULT_BLUR_SPOILER")] + #[serde(alias = "LIBREDDIT_DEFAULT_BLUR_SPOILER")] + pub(crate) default_blur_spoiler: Option, + #[serde(rename = "REDLIB_DEFAULT_SHOW_NSFW")] #[serde(alias = "LIBREDDIT_DEFAULT_SHOW_NSFW")] pub(crate) default_show_nsfw: Option, @@ -130,6 +134,7 @@ impl Config { default_post_sort: parse("REDLIB_DEFAULT_POST_SORT"), default_wide: parse("REDLIB_DEFAULT_WIDE"), default_comment_sort: parse("REDLIB_DEFAULT_COMMENT_SORT"), + default_blur_spoiler: parse("REDLIB_DEFAULT_BLUR_SPOILER"), default_show_nsfw: parse("REDLIB_DEFAULT_SHOW_NSFW"), default_blur_nsfw: parse("REDLIB_DEFAULT_BLUR_NSFW"), default_use_hls: parse("REDLIB_DEFAULT_USE_HLS"), @@ -155,6 +160,7 @@ fn get_setting_from_config(name: &str, config: &Config) -> Option { "REDLIB_DEFAULT_LAYOUT" => config.default_layout.clone(), "REDLIB_DEFAULT_COMMENT_SORT" => config.default_comment_sort.clone(), "REDLIB_DEFAULT_POST_SORT" => config.default_post_sort.clone(), + "REDLIB_DEFAULT_BLUR_SPOILER" => config.default_blur_spoiler.clone(), "REDLIB_DEFAULT_SHOW_NSFW" => config.default_show_nsfw.clone(), "REDLIB_DEFAULT_BLUR_NSFW" => config.default_blur_nsfw.clone(), "REDLIB_DEFAULT_USE_HLS" => config.default_use_hls.clone(), diff --git a/src/instance_info.rs b/src/instance_info.rs index 85c4883..20ffc6d 100644 --- a/src/instance_info.rs +++ b/src/instance_info.rs @@ -141,6 +141,7 @@ impl InstanceInfo { ["Wide", &convert(&self.config.default_wide)], ["Comment sort", &convert(&self.config.default_comment_sort)], ["Post sort", &convert(&self.config.default_post_sort)], + ["Blur Spoiler", &convert(&self.config.default_blur_spoiler)], ["Show NSFW", &convert(&self.config.default_show_nsfw)], ["Blur NSFW", &convert(&self.config.default_blur_nsfw)], ["Use HLS", &convert(&self.config.default_use_hls)], @@ -174,6 +175,7 @@ impl InstanceInfo { Default wide: {:?}\n Default comment sort: {:?}\n Default post sort: {:?}\n + Default blur Spoiler: {:?}\n Default show NSFW: {:?}\n Default blur NSFW: {:?}\n Default use HLS: {:?}\n @@ -197,6 +199,7 @@ impl InstanceInfo { self.config.default_wide, self.config.default_comment_sort, self.config.default_post_sort, + self.config.default_blur_spoiler, self.config.default_show_nsfw, self.config.default_blur_nsfw, self.config.default_use_hls, diff --git a/src/settings.rs b/src/settings.rs index 6964675..6c0480c 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -19,13 +19,14 @@ struct SettingsTemplate { // CONSTANTS -const PREFS: [&str; 16] = [ +const PREFS: [&str; 17] = [ "theme", "front_page", "layout", "wide", "comment_sort", "post_sort", + "blur_spoiler", "show_nsfw", "blur_nsfw", "use_hls", diff --git a/src/utils.rs b/src/utils.rs index f44d037..4d412cc 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -157,6 +157,7 @@ impl PollOption { // Post flags with nsfw and stickied pub struct Flags { + pub spoiler: bool, pub nsfw: bool, pub stickied: bool, } @@ -403,6 +404,7 @@ impl Post { }, }, flags: Flags { + spoiler: data["spoiler"].as_bool().unwrap_or_default(), nsfw: data["over_18"].as_bool().unwrap_or_default(), stickied: data["stickied"].as_bool().unwrap_or_default() || data["pinned"].as_bool().unwrap_or_default(), }, @@ -575,6 +577,7 @@ pub struct Preferences { pub front_page: String, pub layout: String, pub wide: String, + pub blur_spoiler: String, pub show_nsfw: String, pub blur_nsfw: String, pub hide_hls_notification: String, @@ -612,6 +615,7 @@ impl Preferences { front_page: setting(req, "front_page"), layout: setting(req, "layout"), wide: setting(req, "wide"), + blur_spoiler: setting(req, "blur_spoiler"), show_nsfw: setting(req, "show_nsfw"), hide_sidebar_and_summary: setting(req, "hide_sidebar_and_summary"), blur_nsfw: setting(req, "blur_nsfw"), @@ -732,6 +736,7 @@ pub async fn parse_post(post: &Value) -> Post { }, }, flags: Flags { + spoiler: post["data"]["spoiler"].as_bool().unwrap_or_default(), nsfw: post["data"]["over_18"].as_bool().unwrap_or_default(), stickied: post["data"]["stickied"].as_bool().unwrap_or_default() || post["data"]["pinned"].as_bool().unwrap_or(false), }, diff --git a/templates/settings.html b/templates/settings.html index 496b9b1..434f0d2 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -54,6 +54,11 @@ {% call utils::options(prefs.comment_sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %} +
+ + + +
{% if !crate::utils::sfw_only() %}
diff --git a/templates/utils.html b/templates/utils.html index a99e2be..e40d6c6 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -194,6 +194,7 @@ {% endmacro %} {% macro post_in_list(post) -%} +{% set post_should_be_blurred = (post.flags.nsfw && prefs.blur_nsfw=="on") || (post.flags.spoiler && prefs.blur_spoiler=="on") -%}

{% let community -%} @@ -233,7 +234,7 @@ Post image {% else %} @@ -247,19 +248,19 @@

{% 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" %} {% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() %}
-
{% else %}
- +
{% call render_hls_notification(format!("{}%23{}", &self.url[1..].replace("&", "%26").replace("+", "%2B"), post.id)) %} {% endif %} @@ -272,7 +273,7 @@ {% else %}
- + Thumbnail From 1d44bd180e5802f160c40af1924239a3cfcdfaff Mon Sep 17 00:00:00 2001 From: pimlie Date: Sat, 22 Jun 2024 12:38:13 +0200 Subject: [PATCH 022/172] feat: add spoiler badge to post title --- static/style.css | 11 +++++++++++ templates/utils.html | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/static/style.css b/static/style.css index 7cef37c..05b4e4b 100644 --- a/static/style.css +++ b/static/style.css @@ -52,6 +52,7 @@ --visited: #aaa; --shadow: 0 1px 3px rgba(0, 0, 0, 0.5); --popup: #b80a27; + --spoiler: #ddd; /* Hint color theme to browser for scrollbar */ color-scheme: dark; @@ -71,6 +72,7 @@ --highlighted: white; --visited: #555; --shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + --spoiler: #0f0f0f; /* Hint color theme to browser for scrollbar */ color-scheme: light; @@ -929,6 +931,15 @@ a.search_subreddit:hover { font-weight: bold; } +.spoiler { + color: var(--spoiler); + margin-left: 5px; + border: 1px solid var(--spoiler); + padding: 3px; + font-size: 12px; + border-radius: 5px; +} + .post_media_content, .post .__NoScript_PlaceHolder__, .gallery { max-width: calc(100% - 40px); grid-area: post_media; diff --git a/templates/utils.html b/templates/utils.html index e40d6c6..2722218 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -93,6 +93,7 @@ style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};">{% call render_flair(post.flair.flair_parts) %} {% endif %} {% if post.flags.nsfw %} NSFW{% endif %} + {% if post.flags.spoiler %} Spoiler{% endif %} @@ -223,7 +224,7 @@ style="color:{{ post.flair.foreground_color }}; background:{{ post.flair.background_color }};" dir="ltr">{% call render_flair(post.flair.flair_parts) %} {% endif %} - {{ post.title }}{% if post.flags.nsfw %} NSFW{% endif %} + {{ post.title }}{% if post.flags.nsfw %} NSFW{% endif %}{% if post.flags.spoiler %} Spoiler{% endif %} {% if (prefs.layout.is_empty() || prefs.layout == "card") && post.post_type == "image" %} From 69f9d9ff3c38a78136dda889730d8f391be28165 Mon Sep 17 00:00:00 2001 From: pimlie Date: Sat, 22 Jun 2024 12:47:33 +0200 Subject: [PATCH 023/172] feat: also blur spoiler previews on post view --- templates/utils.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/utils.html b/templates/utils.html index 2722218..8edb55b 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -62,6 +62,7 @@ {%- endmacro %} {% macro post(post) -%} +{% set post_should_be_blurred = post.flags.spoiler && prefs.blur_spoiler=="on" -%}

@@ -102,12 +103,13 @@

{% if post.media.height == 0 || post.media.width == 0 %} - - Post image + + Post image {% else %} @@ -121,7 +123,7 @@ {% if prefs.use_hls == "on" && !post.media.alt_url.is_empty() %}
-
- 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 046/172] 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 047/172] 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 048/172] 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() %}