From 7e32951eac06521b6fa7c0793c14990b30ede541 Mon Sep 17 00:00:00 2001
From: zarzet <42882290+zarzet@users.noreply.github.com>
Date: Sun, 27 Sep 2026 11:39:33 +0700
Subject: [PATCH] fix(lyrics): preserve group alignment in eLRC fallback

---
 .../crates/core/src/lyrics/payloads.rs        | 21 +++++++++++++++++--
 .../crates/providers/src/lyrics/cache.rs      |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/rust_backend/crates/core/src/lyrics/payloads.rs b/rust_backend/crates/core/src/lyrics/payloads.rs
index 7ec1ac08..d6bfd38b 100644
--- a/rust_backend/crates/core/src/lyrics/payloads.rs
+++ b/rust_backend/crates/core/src/lyrics/payloads.rs
@@ -229,7 +229,11 @@ pub fn format_apple(raw: &str, multi_person: bool, word_timing: bool) -> Result<
             return Ok(apple_vocal_sides(value.elrc_multi_person.trim(), &value));
         }
         if word_timing && !value.elrc.trim().is_empty() {
-            return Ok(value.elrc.trim().into());
+            return Ok(if multi_person {
+                apple_vocal_sides(value.elrc.trim(), &value)
+            } else {
+                value.elrc.trim().into()
+            });
         }
         let content = value.content.as_deref().unwrap_or_default();
         if !value.plain.trim().is_empty() && content.is_empty() {
@@ -556,7 +560,7 @@ mod supplement_tests {
 
     #[test]
     fn apple_agents_restore_vocal_sides_without_reformatting_word_times() {
-        let raw = serde_json::json!({
+        let mut raw = serde_json::json!({
             "type": "Syllable",
             "elrcMultiPerson": "[00:01.01]v1: <00:01.009>Lead<00:02.00>\n[bg:<00:01.50>Echo<00:02.50>]\n[00:03.00]v2: <00:03.00>Guest<00:04.00>\n[00:05.00]v2: <00:05.00>Together<00:06.00>\n[00:07.00]v2: Third",
             "content": [
@@ -581,6 +585,19 @@ mod supplement_tests {
         let stored = lrc::with_metadata(&lyrics, "Track", "Artist");
         assert!(stored.contains("[00:05.00]v1: <00:05.00>Together<00:06.00>"));
         assert!(stored.contains("[bg:<00:01.50>Echo<00:02.50>]"));
+
+        // Some responses carry vocal labels only in the regular eLRC field.
+        // It must use the same agent correction as the multi-person field.
+        raw["elrc"] = raw
+            .as_object_mut()
+            .unwrap()
+            .remove("elrcMultiPerson")
+            .unwrap();
+        assert_eq!(format_apple(&raw.to_string(), true, true).unwrap(), text);
+        assert_eq!(
+            format_apple(&raw.to_string(), false, true).unwrap(),
+            raw["elrc"].as_str().unwrap()
+        );
     }
 
     #[test]
diff --git a/rust_backend/crates/providers/src/lyrics/cache.rs b/rust_backend/crates/providers/src/lyrics/cache.rs
index 0e01f777..ec8a8a9c 100644
--- a/rust_backend/crates/providers/src/lyrics/cache.rs
+++ b/rust_backend/crates/providers/src/lyrics/cache.rs
@@ -13,7 +13,7 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
 pub const MAX_ENTRIES: usize = 500;
 pub const TTL: Duration = Duration::from_secs(24 * 60 * 60);
 const MAX_PERSISTED_BYTES: u64 = 64 << 20;
-const SNAPSHOT_VERSION: u32 = 4;
+const SNAPSHOT_VERSION: u32 = 5;
 
 #[derive(Clone)]
 struct Entry {