Merge pull request 'fix(deps): update rust crate actix-http to v3.11.0' (#26) from renovate/actix-http-3.x-lockfile into main

Reviewed-on: #26

.gitea/workflows/docker.yml

@@ -1,28 +1,34 @@
-name: Build and publish the docker image
+name: docker
 
 on:
   push:
-    branches: ["custom"]
+    branches:
+      - "main"
+    paths-ignore:
+      - "README.md"
+      - "LICENSE.txt"
+      - "docker-compose.example.yml"
+      - "ups.json"
 
 env:
   REGISTRY: git.ngn.tf
   IMAGE: ${{gitea.repository}}
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: "https://github.com/actions/checkout@v4"
+        uses: actions/checkout@v4
 
       - name: Login to container repo
-        uses: "https://github.com/docker/login-action@v1"
+        uses: docker/login-action@v1
         with:
           registry: ${{env.REGISTRY}}
           username: ${{gitea.actor}}
           password: ${{secrets.PACKAGES_TOKEN}}
 
-      - name: Build image
+      - name: Build docker image
         run: |
           docker build . --tag ${{env.REGISTRY}}/${{env.IMAGE}}:latest
           docker push ${{env.REGISTRY}}/${{env.IMAGE}}:latest

.gitea/workflows/ups.yml

@@ -0,0 +1,25 @@
+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

Cargo.toml

@@ -14,6 +14,7 @@ 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"

README.md

@@ -1,5 +1,7 @@
-# [ngn.tf] | libmedium
+# libmedium - proxy for medium.com
 
-![](https://git.ngn.tf/ngn/libmedium/actions/workflows/build.yml/badge.svg)
+![](https://git.ngn.tf/ngn/libmedium/actions/workflows/docker.yml/badge.svg)
+![](https://git.ngn.tf/ngn/libmedium/actions/workflows/ups.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.

src/data.rs

@@ -164,14 +164,14 @@ impl Data {
         }
     }
 
-    pub async fn get_post_light(&self, id: &str) -> PostUrl {
+    pub async fn get_post_light(&self, id: &str) -> Option<PostUrl> {
         match self.posts.get(id) {
             Ok(Some(v)) => {
                 let cached: PostResp = bincode::deserialize(&v[..]).unwrap();
-                PostUrl {
+                Some(PostUrl {
                     slug: cached.unique_slug,
                     username: cached.creator.username,
-                }
+                })
             }
             _ => {
                 let vars = get_post_light::Variables { id: id.to_owned() };
@@ -180,10 +180,16 @@ impl Data {
                 let res = post_graphql::<GetPostLight, _>(&self.client, URL, vars)
                     .await
                     .unwrap();
-                let res = res.data.expect("missing response data").post.unwrap();
+                if res.data.is_none() {
-                PostUrl {
+                    None
-                    slug: res.unique_slug,
+                } else {
-                    username: res.creator.username,
+                    match res.data.expect("missing response data").post {
+                        None => None,
+                        Some(res) => Some(PostUrl {
+                            slug: res.unique_slug,
+                            username: res.creator.username,
+                        }),
+                    }
                 }
             }
         }

src/proxy.rs

@@ -158,29 +158,33 @@ 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 {
-    let post_data = data.get_post_light(&path).await;
+    match data.get_post_light(&path).await {
-    HttpResponse::Found()
+        None => HttpResponse::NotFound().body("Post not found"),
-        .append_header((
+        Some(post_data) => HttpResponse::Found()
-            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()
+            .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(),
+        }
     } else {
         HttpResponse::NotFound().body("Post not found, please file bug report")
     }

src/settings.rs

@@ -43,7 +43,7 @@ impl Settings {
         if let Ok(path) = env::var("LIBMEDIUM") {
             s = s.add_source(File::with_name(&path));
         } else if Path::new("./config.toml").exists() {
-            s = s.add_source(File::with_name("./config.toml");
+            s = s.add_source(File::with_name("./config.toml"));
         } else {
             log::warn!("configuration file not found");
         }

ups.json

@@ -0,0 +1,5 @@
+{
+  "upstream": "https://git.batsense.net/realaravinth/libmedium",
+  "provider": "gitea",
+  "commit": "c7154807884e1bb8228a7682c5a3dee9becf5ac4"
+}