fix(deps): update rust crate actix-web to v4.11.0

2025-05-12 07:01:27 +00:00
8 changed files with 76 additions and 213 deletions
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -1,34 +1,28 @@
-name: docker
+name: Build and publish the docker image

 on:
  push:
-    branches:
-      - "main"
-    paths-ignore:
-      - "README.md"
-      - "LICENSE.txt"
-      - "docker-compose.example.yml"
-      - "ups.json"
+    branches: ["custom"]

 env:
  REGISTRY: git.ngn.tf
  IMAGE: ${{gitea.repository}}

 jobs:
-  docker:
+  build:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: "https://github.com/actions/checkout@v4"

      - name: Login to container repo
-        uses: docker/login-action@v1
+        uses: "https://github.com/docker/login-action@v1"
        with:
          registry: ${{env.REGISTRY}}
          username: ${{gitea.actor}}
          password: ${{secrets.PACKAGES_TOKEN}}

-      - name: Build docker image
+      - name: Build image
        run: |
          docker build . --tag ${{env.REGISTRY}}/${{env.IMAGE}}:latest
          docker push ${{env.REGISTRY}}/${{env.IMAGE}}:latest
--- a/.gitea/workflows/ups.yml
+++ b/.gitea/workflows/ups.yml
@@ -1,25 +0,0 @@
-name: ups
-
-on:
-  schedule:
-    - cron: "@weekly"
-
-jobs:
-  ups:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt update -y
-          sudo apt install -y python3 python3-build python3-requests make
-
-      - name: Install ups
-        run: |
-          git clone https://git.ngn.tf/ngn/ups && cd ups
-          make && make install
-
-      - name: Run ups
-        run: PATH=~/.local/bin:$PATH ups-check
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,29 +19,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "actix-files"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be"
-dependencies = [
- "actix-http",
- "actix-service",
- "actix-utils",
- "actix-web",
- "bitflags 2.5.0",
- "bytes",
- "derive_more 0.99.18",
- "futures-core",
- "http-range",
- "log",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite",
- "v_htmlescape",
-]
-
 [[package]]
 name = "actix-http"
 version = "3.11.0"
@@ -119,16 +96,16 @@ dependencies = [

 [[package]]
 name = "actix-server"
-version = "2.3.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4"
+checksum = "a65064ea4a457eaf07f2fba30b4c695bf43b721790e9530d26cb6f9019ff7502"
 dependencies = [
 "actix-rt",
 "actix-service",
 "actix-utils",
 "futures-core",
 "futures-util",
- "mio 0.8.11",
+ "mio",
 "socket2",
 "tokio",
 "tracing",
@@ -157,9 +134,9 @@ dependencies = [

 [[package]]
 name = "actix-web"
-version = "4.6.0"
+version = "4.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32"
+checksum = "a597b77b5c6d6a1e1097fddde329a83665e25c5437c696a3a9a4aa514a614dea"
 dependencies = [
 "actix-codec",
 "actix-http",
@@ -170,15 +147,16 @@ dependencies = [
 "actix-service",
 "actix-utils",
 "actix-web-codegen",
- "ahash 0.8.11",
 "bytes",
 "bytestring",
 "cfg-if",
 "cookie",
- "derive_more 0.99.18",
+ "derive_more 2.0.1",
 "encoding_rs",
+ "foldhash",
 "futures-core",
 "futures-util",
+ "impl-more",
 "itoa",
 "language-tags",
 "log",
@@ -193,14 +171,15 @@ dependencies = [
 "smallvec",
 "socket2",
 "time",
+ "tracing",
 "url",
 ]

 [[package]]
 name = "actix-web-codegen"
-version = "4.2.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5"
+checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8"
 dependencies = [
 "actix-router",
 "proc-macro2",
@@ -246,19 +225,6 @@ dependencies = [
 "version_check",
 ]

-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom 0.2.15",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -451,16 +417,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "wasm-bindgen",
- "windows-link",
+ "windows-targets 0.52.5",
 ]

 [[package]]
@@ -980,7 +946,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.8",
+ "ahash",
 ]

 [[package]]
@@ -1001,12 +967,6 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"

-[[package]]
-name = "hermit-abi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1044,12 +1004,6 @@ dependencies = [
 "pin-project-lite",
 ]

-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -1267,6 +1221,12 @@ dependencies = [
 "icu_properties",
 ]

+[[package]]
+name = "impl-more"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2"
+
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -1298,7 +1258,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
 "libc",
 "windows-sys 0.52.0",
 ]
@@ -1366,7 +1326,6 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 name = "libmedium"
 version = "0.1.0"
 dependencies = [
- "actix-files",
 "actix-http",
 "actix-rt",
 "actix-web",
@@ -1460,16 +1419,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"

-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -1485,18 +1434,6 @@ dependencies = [
 "adler",
 ]

-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.3"
@@ -1504,6 +1441,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
 "libc",
+ "log",
 "wasi 0.11.0+wasi-snapshot-preview1",
 "windows-sys 0.52.0",
 ]
@@ -1552,11 +1490,11 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.17.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.5.1",
+ "hermit-abi",
 "libc",
 ]

@@ -1571,9 +1509,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

 [[package]]
 name = "onig"
@@ -2212,9 +2150,9 @@ dependencies = [

 [[package]]
 name = "sha256"
-version = "1.6.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f880fc8562bdeb709793f00eb42a2ad0e672c4f883bbe59122b926eca935c8f6"
+checksum = "18278f6a914fa3070aa316493f7d2ddfb9ac86ebc06fa3b83bffda487e9065b0"
 dependencies = [
 "async-trait",
 "bytes",
@@ -2452,7 +2390,7 @@ dependencies = [
 "backtrace",
 "bytes",
 "libc",
- "mio 1.0.3",
+ "mio",
 "parking_lot 0.12.3",
 "pin-project-lite",
 "signal-hook-registry",
@@ -2540,9 +2478,21 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
 "log",
 "pin-project-lite",
+ "tracing-attributes",
 "tracing-core",
 ]

+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@@ -2570,12 +2520,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"

-[[package]]
-name = "unicase"
-version = "2.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -2620,12 +2564,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"

-[[package]]
-name = "v_htmlescape"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -2794,12 +2732,6 @@ dependencies = [
 "windows-targets 0.52.5",
 ]

-[[package]]
-name = "windows-link"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3012,26 +2944,6 @@ dependencies = [
 "synstructure",
 ]

-[[package]]
-name = "zerocopy"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "zerofrom"
 version = "0.1.5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ version = "0.1.0"
 actix-http = "3.0.4"
 actix-rt = "2"
 actix-web = "4.0.1"
-actix-files = "0.6.6"
 bincode = "1.3.3"
 chrono = "0.4.23"
 config = "0.13"
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
-# libmedium - proxy for medium.com
+# [ngn.tf] | libmedium

-![](https://git.ngn.tf/ngn/libmedium/actions/workflows/docker.yml/badge.svg)
-![](https://git.ngn.tf/ngn/libmedium/actions/workflows/ups.yml/badge.svg)
+![](https://git.ngn.tf/ngn/libmedium/actions/workflows/build.yml/badge.svg)

-A fork of the [libmedium](https://github.com/realaravinth/libmedium) project,
-with my personal changes.
+A fork of the [libmedium](https://github.com/realaravinth/libmedium) project, with my personal changes.
--- a/src/data.rs
+++ b/src/data.rs
@@ -164,14 +164,14 @@ impl Data {
        }
    }

-    pub async fn get_post_light(&self, id: &str) -> Option<PostUrl> {
+    pub async fn get_post_light(&self, id: &str) -> PostUrl {
        match self.posts.get(id) {
            Ok(Some(v)) => {
                let cached: PostResp = bincode::deserialize(&v[..]).unwrap();
-                Some(PostUrl {
+                PostUrl {
                    slug: cached.unique_slug,
                    username: cached.creator.username,
-                })
+                }
            }
            _ => {
                let vars = get_post_light::Variables { id: id.to_owned() };
@@ -180,16 +180,10 @@ impl Data {
                let res = post_graphql::<GetPostLight, _>(&self.client, URL, vars)
                    .await
                    .unwrap();
-                if res.data.is_none() {
-                    None
-                } else {
-                    match res.data.expect("missing response data").post {
-                        None => None,
-                        Some(res) => Some(PostUrl {
-                            slug: res.unique_slug,
-                            username: res.creator.username,
-                        }),
-                    }
+                let res = res.data.expect("missing response data").post.unwrap();
+                PostUrl {
+                    slug: res.unique_slug,
+                    username: res.creator.username,
                }
            }
        }
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -158,33 +158,29 @@ async fn assets(path: web::Path<String>, data: AppData) -> impl Responder {

 #[actix_web_codegen_const_routes::get(path = "crate::V1_API_ROUTES.proxy.by_post_id")]
 async fn by_post_id(path: web::Path<String>, data: AppData) -> impl Responder {
-    match data.get_post_light(&path).await {
-        None => HttpResponse::NotFound().body("Post not found"),
-        Some(post_data) => HttpResponse::Found()
+    let post_data = data.get_post_light(&path).await;
+    HttpResponse::Found()
+        .append_header((
+            header::LOCATION,
+            crate::V1_API_ROUTES
+                .proxy
+                .get_page(&post_data.username, &post_data.slug),
+        ))
+        .finish()
+}
+
+#[actix_web_codegen_const_routes::get(path = "crate::V1_API_ROUTES.proxy.top_level_post")]
+async fn by_top_level_post(path: web::Path<String>, data: AppData) -> impl Responder {
+    if let Some(post_id) = path.split('-').last() {
+        let post_data = data.get_post_light(post_id).await;
+        HttpResponse::Found()
            .append_header((
                header::LOCATION,
                crate::V1_API_ROUTES
                    .proxy
                    .get_page(&post_data.username, &post_data.slug),
            ))
-            .finish(),
-    }
-}
-
-#[actix_web_codegen_const_routes::get(path = "crate::V1_API_ROUTES.proxy.top_level_post")]
-async fn by_top_level_post(path: web::Path<String>, data: AppData) -> impl Responder {
-    if let Some(post_id) = path.split('-').last() {
-        match data.get_post_light(post_id).await {
-            None => HttpResponse::NotFound().body("Post not found"),
-            Some(post_data) => HttpResponse::Found()
-                .append_header((
-                    header::LOCATION,
-                    crate::V1_API_ROUTES
-                        .proxy
-                        .get_page(&post_data.username, &post_data.slug),
-                ))
-                .finish(),
-        }
+            .finish()
    } else {
        HttpResponse::NotFound().body("Post not found, please file bug report")
    }
--- a/ups.json
+++ b/ups.json
@@ -1,5 +0,0 @@
-{
-  "upstream": "https://git.batsense.net/realaravinth/libmedium",
-  "provider": "gitea",
-  "commit": "c7154807884e1bb8228a7682c5a3dee9becf5ac4"
-}