Upload main.rs

src/main.rs

@@ -1083,25 +1083,41 @@ async fn send_audio(
     // /send_audio платил полный DNS+TLS handshake с нуля, и на "холодных"
     // контейнерах это не укладывалось в connect_timeout (лог показывал
     // ровно 10.0с — таймаут коннекта, а не медленную передачу данных).
-    let tg_url = format!("https://api.telegram.org/bot{}/sendAudio", bot_token);
+    let is_flac = ext == "flac";
+    let tg_method = if is_flac { "sendDocument" } else { "sendAudio" };
+    let tg_url = format!("https://api.telegram.org/bot{}/{}", bot_token, tg_method);
     let tg_http = state.tg_http.clone();
 
+    // sendDocument не знает полей title/performer/duration (это специфика sendAudio) —
+    // для FLAC собираем из них caption, чтобы информация не терялась.
+    let caption = match (&q.performer, &q.title) {
+        (Some(p), Some(t)) => Some(format!("{} — {}", p, t)),
+        (None, Some(t)) => Some(t.clone()),
+        (Some(p), None) => Some(p.clone()),
+        (None, None) => None,
+    };
+
     let mut tg_json: Option<serde_json::Value> = None;
     let mut last_tg_err: Option<String> = None;
 
     for attempt in 1..=3u8 {
-        tracing::info!("Telegram sendAudio attempt {} for track {} ({} bytes)", attempt, q.id, dec.len());
-        
+        tracing::info!("Telegram {} attempt {} for track {} ({} bytes)", tg_method, attempt, q.id, dec.len());
+
         let part = reqwest::multipart::Part::bytes(dec.clone())
             .file_name(filename.clone())
             .mime_str(mime)
             .unwrap();
         let mut form = reqwest::multipart::Form::new()
-            .text("chat_id", q.chat_id.clone())
-            .part("audio", part);
-        if let Some(ref t) = q.title { form = form.text("title", t.clone()); }
-        if let Some(ref p) = q.performer { form = form.text("performer", p.clone()); }
-        if let Some(d) = q.duration { form = form.text("duration", d.to_string()); }
+            .text("chat_id", q.chat_id.clone());
+        if is_flac {
+            form = form.part("document", part);
+            if let Some(ref c) = caption { form = form.text("caption", c.clone()); }
+        } else {
+            form = form.part("audio", part);
+            if let Some(ref t) = q.title { form = form.text("title", t.clone()); }
+            if let Some(ref p) = q.performer { form = form.text("performer", p.clone()); }
+            if let Some(d) = q.duration { form = form.text("duration", d.to_string()); }
+        }
 
         match tg_http.post(&tg_url).multipart(form).send().await {
             Ok(resp) => {
@@ -1110,7 +1126,7 @@ async fn send_audio(
                     Ok(j) => {
                         if status.is_success() && j.get("ok").and_then(|v| v.as_bool()) == Some(true) {
                             tg_json = Some(j);
-                            tracing::info!("Telegram sendAudio success on attempt {}", attempt);
+                            tracing::info!("Telegram {} success on attempt {}", tg_method, attempt);
                             break;
                         }
                         let desc = j
@@ -1118,17 +1134,17 @@ async fn send_audio(
                             .and_then(|v| v.as_str())
                             .unwrap_or("unknown")
                             .to_string();
-                        tracing::warn!("Telegram sendAudio attempt {} failed: status={} desc={}", attempt, status, desc);
+                        tracing::warn!("Telegram {} attempt {} failed: status={} desc={}", tg_method, attempt, status, desc);
                         last_tg_err = Some(format!("Telegram {}: {}", status, desc));
                     }
                     Err(e) => {
-                        tracing::warn!("Telegram sendAudio attempt {} parse failed: {}", attempt, e);
+                        tracing::warn!("Telegram {} attempt {} parse failed: {}", tg_method, attempt, e);
                         last_tg_err = Some(format!("Telegram parse: {}", e));
                     }
                 }
             }
             Err(e) => {
-                tracing::warn!("Telegram sendAudio attempt {} upload failed: {}", attempt, e);
+                tracing::warn!("Telegram {} attempt {} upload failed: {}", tg_method, attempt, e);
                 last_tg_err = Some(format!("Telegram upload: {}", e));
             }
         }
@@ -1142,12 +1158,12 @@ async fn send_audio(
         Some(j) => j,
         None => {
             let err = last_tg_err.unwrap_or_else(|| "Telegram upload failed".to_string());
-            tracing::error!("Telegram sendAudio final failure: {}", err);
+            tracing::error!("Telegram {} final failure: {}", tg_method, err);
             return json_error(StatusCode::BAD_GATEWAY, err);
         }
     };
 
-    let file_id = tg_json.pointer("/result/audio/file_id")
+    let file_id = tg_json.pointer(if is_flac { "/result/document/file_id" } else { "/result/audio/file_id" })
         .and_then(|v| v.as_str())
         .unwrap_or("")
         .to_string();