fixes

fxpixiv.service.nix

@@ -34,11 +34,15 @@ in
       serviceConfig.ExecStart = "${fxpixivApp}/bin/fxpixiv";
 
       # Set the port environment variable
-      serviceConfig.Environment = [ 
+      serviceConfig.EnvironmentFile = pkgs.writeTextFile {
-        "ROCKET_ENV=release"
+        name = "fxpixiv.env";
-        "ROCKET_PORT=${toString config.services.fxpixiv.port}"
+        text = ''
-        "PIXIV_REFRESH_TOKEN=${toString config.services.fxpixiv.refreshToken}"
+          "ROCKET_ENV=release"
-      ];
+          "ROCKET_PORT=${toString config.services.fxpixiv.port}"
+          "PIXIV_REFRESH_TOKEN=${toString config.services.fxpixiv.refreshToken}"
+        '';
+        meta.mode = "0600";
+      };
 
       # Restart on failure
       serviceConfig.WorkingDirectory = "/var/lib/fxpixiv";

fxpixiv/src/main.rs

@@ -112,9 +112,9 @@ async fn fetch_illust(
             ";
             if illust.meta_pages.is_empty() {
                 let _ = sqlx::query(pages_query)
-                    .bind(illust.image_urls.square_medium)
+                    .bind(&illust.image_urls.square_medium)
-                    .bind(illust.image_urls.medium)
+                    .bind(&illust.image_urls.medium)
-                    .bind(illust.image_urls.large)
+                    .bind(&illust.image_urls.large)
                     .bind(
                         &illust
                             .meta_single_page
@@ -144,14 +144,8 @@ async fn fetch_illust(
                 });
             }
 
-            let image = if illust.page_count == 1 {
-                illust.meta_single_page.unwrap().original_image_url.unwrap()
-            } else {
-                illust.meta_pages[0].image_urls.original.clone()
-            };
-
             return Some(Metadata {
-                image: image.as_str().replace("pximg.net", "fixiv.net"),
+                image: illust.image_urls.large.replace("pximg.net", "fixiv.net"),
                 title: illust.title,
                 desc: illust.caption,
             });