From 73f82aee3b643eee9e288954f6ba79d018fd21dd Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 28 Oct 2025 18:36:20 +0200 Subject: [PATCH] chore: update docker-compose file --- docker-compose.yml | 17 +++++++++-------- src/download.rs | 8 ++++---- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9a2b6f1..1f060b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,15 +5,16 @@ services: dockerfile: Dockerfile args: BINARY_NAME: tg-relay-rs + env_file: .env environment: - TELOXIDE_TOKEN: ${TELOXIDE_TOKEN} - IG_SESSION_COOKIE_PATH: /app/www.instagram.com_cookies.txt - TIKTOK_SESSION_COOKIE_PATH: /app/www.tiktok.com_cookies.txt - YOUTUBE_SESSION_COOKIE_PATH: /app/www.youtube.com_cookies.txt - RUST_LOG: ${RUST_LOG:-info} + IG_SESSION_COOKIE_PATH: /app/instagram.txt + TIKTOK_SESSION_COOKIE_PATH: /app/tiktok.txt + TWITTER_SESSION_COOKIE_PATH: /app/twitter.txt + YOUTUBE_SESSION_COOKIE_PATH: /app/youtube.txt restart: unless-stopped volumes: - ./comments.txt:/app/comments.txt:ro - - ${IG_SESSION_COOKIE_PATH:-/etc/secrets/www.instagram.com_cookies.txt}:/app/www.instagram.com_cookies.txt:rw - - ${TIKTOK_SESSION_COOKIE_PATH:-/etc/secrets/www.tiktok.com_cookies.txt}:/app/www.tiktok.com_cookies.txt:rw - - ${YOUTUBE_SESSION_COOKIE_PATH:-/etc/secrets/www.youtube.com_cookies.txt}:/app/www.youtube.com_cookies.txt:rw + - ${IG_SESSION_COOKIE_PATH:-/etc/secrets/www.instagram.com_cookies.txt}:/app/instagram.txt:rw + - ${TIKTOK_SESSION_COOKIE_PATH:-/etc/secrets/www.tiktok.com_cookies.txt}:/app/tiktok.txt:rw + - ${TWITTER_SESSION_COOKIE_PATH:-/etc/secrets/www.twitter.com_cookies.txt}:/app/twitter.txt:rw + - ${YOUTUBE_SESSION_COOKIE_PATH:-/etc/secrets/www.youtube.com_cookies.txt}:/app/youtube.txt:rw diff --git a/src/download.rs b/src/download.rs index c6f047b..b8777a2 100644 --- a/src/download.rs +++ b/src/download.rs @@ -17,7 +17,7 @@ use std::{ use teloxide::{Bot, types::ChatId}; use tempfile::{TempDir, tempdir}; use tokio::{fs::read_dir, process::Command}; -use tracing::{debug, info, warn}; +use tracing::{debug, warn}; const FORBIDDEN_EXTENSIONS: &[&str] = &["json", "txt", "log"]; @@ -76,7 +76,7 @@ async fn run_command_in_tempdir(cmd: &str, args: &[&str]) -> Result Result<()> { - info!(files = dr.files.len(), "Processing download result"); + debug!(files = dr.files.len(), "Processing download result"); if dr.files.is_empty() { return Err(Error::NoMediaFound); @@ -217,7 +217,7 @@ pub async fn process_download_result( MediaKind::Unknown => 2, }); - info!(media_items = media_items.len(), "Sending media to chat"); + debug!(media_items = media_items.len(), "Sending media to chat"); if let Some((path, kind)) = media_items.first() { return send_media_from_path(bot, chat_id, path.clone(), *kind).await;