From 8e339e53c7405f54b7010f7ab6ba52b89346e54a Mon Sep 17 00:00:00 2001
From: Kristofers Solo <dev@kristofers.xyz>
Date: Mon, 27 Oct 2025 10:47:52 +0200
Subject: [PATCH] fix(instagram): session cookie

---
 docker-compose.yml |  6 ++----
 src/download.rs    | 35 +++++------------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a6d9743..f86287f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,11 +7,9 @@ services:
         BINARY_NAME: tg-relay-rs
     environment:
       TELOXIDE_TOKEN: ${TELOXIDE_TOKEN}
-      COOKIES_PATH: ${YT_COOKIES_PATH:-/app/yt-cookies.txt}
-      SESSION_PATH: ${IG_SESSION_PATH:-/app/ig-session}
+      IG_SESSION_COOKIE_PATH: /app/www.instagram.com_cookies.txt
       RUST_LOG: ${RUST_LOG:-info}
     restart: unless-stopped
     volumes:
       - ./comments.txt:/app/comments.txt:ro
-      - /etc/secrets/ig-session:${IG_SESSION_PATH:-/app/ig-session}:ro
-      - /etc/secrets/yt-cookies.txt:${YT_COOKIES_PATH:-/app/yt-cookies.txt}:rw
+      - ${IG_SESSION_COOKIE_PATH:-/etc/secrets/www.instagram.com_cookies.txt}:/app/www.instagram.com_cookies.txt:rw
diff --git a/src/download.rs b/src/download.rs
index 1008c73..bd7d018 100644
--- a/src/download.rs
+++ b/src/download.rs
@@ -117,9 +117,8 @@ pub async fn download_instaloader(url: &str) -> Result<DownloadResult> {
         .map(ToString::to_string)
         .collect::<Vec<_>>();
 
-    let cookies_path = env::var("COOKIES_PATH").ok();
-    if let Some(cookies) = read_cookies_file(cookies_path) {
-        args.extend(["--cookies".into(), cookies]);
+    if let Ok(cookies_path) = env::var("IG_SESSION_COOKIE_PATH") {
+        args.extend(["--cookies".into(), cookies_path]);
     }
 
     args.push(url.into());
@@ -136,7 +135,7 @@ pub async fn download_instaloader(url: &str) -> Result<DownloadResult> {
 /// - Propagates `run_command_in_tempdir` errors.
 #[cfg(feature = "youtube")]
 pub async fn download_ytdlp(url: &str) -> Result<DownloadResult> {
-    let base_args = [
+    let args = [
         "--no-playlist",
         "-t",
         "mp4",
@@ -148,34 +147,10 @@ pub async fn download_ytdlp(url: &str) -> Result<DownloadResult> {
         "-f",
         "--postprocessor-args",
         "ffmpeg:-vf setsar=1 -c:v libx264 -crf 28 -preset ultrafast -maxrate 800k -bufsize 1600k -vf scale=854:480 -c:a aac -b:a 64k -movflags +faststart",
+        url,
     ];
 
-    let mut args = base_args
-        .iter()
-        .map(ToString::to_string)
-        .collect::<Vec<_>>();
-
-    let cookies_path = env::var("COOKIES_PATH").ok();
-    if let Some(cookies) = read_cookies_file(cookies_path) {
-        args.extend(["--cookies".into(), cookies]);
-    }
-
-    args.push(url.into());
-
-    let args_ref = args.iter().map(String::as_ref).collect::<Vec<_>>();
-
-    run_command_in_tempdir("yt-dlp", &args_ref).await
-}
-
-fn read_cookies_file<P: AsRef<Path>>(cookies_path: Option<P>) -> Option<String> {
-    if let Some(cookie_path) = cookies_path {
-        let path = cookie_path.as_ref();
-        if path.exists() {
-            return Some(path.to_string_lossy().to_string());
-        }
-        warn!("Cookies file not found: {}", path.display());
-    }
-    None
+    run_command_in_tempdir("yt-dlp", &args).await
 }
 
 /// Post-process a `DownloadResult`.