From b6fce0e6862727fe90a8af1e02903c3207f83e14 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@users.noreply.github.com>
Date: Wed, 22 May 2024 09:15:14 -0700
Subject: [PATCH] Fix XML marshaling of OpenSubsonic structured lyrics (#3041)

---
 ...ponses LyricsList with data should match .XML | 16 ++++------------
 server/subsonic/responses/responses.go           |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/server/subsonic/responses/.snapshots/Responses LyricsList with data should match .XML b/server/subsonic/responses/.snapshots/Responses LyricsList with data should match .XML
index 3f3e540d4..262b1d390 100644
--- a/server/subsonic/responses/.snapshots/Responses LyricsList with data should match .XML	
+++ b/server/subsonic/responses/.snapshots/Responses LyricsList with data should match .XML	
@@ -1,20 +1,12 @@
 <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
   <lyricsList>
     <structuredLyrics displayArtist="Rick Astley" displayTitle="Never Gonna Give You Up" lang="eng" offset="100" synced="true">
-      <line start="18800">
-        <value>We&#39;re no strangers to love</value>
-      </line>
-      <line start="22801">
-        <value>You know the rules and so do I</value>
-      </line>
+      <line start="18800">We&#39;re no strangers to love</line>
+      <line start="22801">You know the rules and so do I</line>
     </structuredLyrics>
     <structuredLyrics displayArtist="Rick Astley" displayTitle="Never Gonna Give You Up" lang="xxx" offset="100" synced="false">
-      <line>
-        <value>We&#39;re no strangers to love</value>
-      </line>
-      <line>
-        <value>You know the rules and so do I</value>
-      </line>
+      <line>We&#39;re no strangers to love</line>
+      <line>You know the rules and so do I</line>
     </structuredLyrics>
   </lyricsList>
 </subsonic-response>
diff --git a/server/subsonic/responses/responses.go b/server/subsonic/responses/responses.go
index fb577cad3..8e3edaf4f 100644
--- a/server/subsonic/responses/responses.go
+++ b/server/subsonic/responses/responses.go
@@ -458,7 +458,7 @@ type JukeboxPlaylist struct {
 
 type Line struct {
 	Start *int64 `xml:"start,attr,omitempty" json:"start,omitempty"`
-	Value string `xml:"value"                json:"value"`
+	Value string `xml:",chardata"            json:"value"`
 }
 
 type StructuredLyric struct {