.gitea/workflows/build.yml

@@ -1,34 +1,28 @@
-name: docker
+name: Build and publish the docker image
 
 on:
   push:
-    branches:
+    branches: ["custom"]
-      - "main"
-    paths-ignore:
-      - "README.md"
-      - "LICENSE.txt"
-      - "docker-compose.example.yml"
-      - "ups.json"
 
 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

.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

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/build.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,
+A fork of the [libmedium](https://github.com/realaravinth/libmedium) project, with my personal changes.
-with my personal changes.

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() {
+                let res = res.data.expect("missing response data").post.unwrap();
-                    None
+                PostUrl {
-                } else {
+                    slug: res.unique_slug,
-                    match res.data.expect("missing response data").post {
+                    username: res.creator.username,
-                        None => None,
-                        Some(res) => Some(PostUrl {
-                            slug: res.unique_slug,
-                            username: res.creator.username,
-                        }),
-                    }
                 }
             }
         }

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 {
+    let post_data = data.get_post_light(&path).await;
-        None => HttpResponse::NotFound().body("Post not found"),
+    HttpResponse::Found()
-        Some(post_data) => 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(),
+            .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")
     }

ups.json

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