Deserialize instead

psst-gui/src/data/playlist.rs

@@ -2,6 +2,8 @@ use std::sync::Arc;
 
 use druid::{im::Vector, Data, Lens};
 use serde::{Deserialize, Deserializer, Serialize};
+use sanitize_html::rules::predefined::DEFAULT;
+use sanitize_html::sanitize_str;
 
 use crate::data::{user::PublicUser, Image, Promise, Track, TrackId};
 
@@ -29,6 +31,7 @@ pub struct Playlist {
     pub name: Arc<str>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub images: Option<Vector<Image>>,
+    #[serde(deserialize_with = "deserialize_sanitized_description")]
     pub description: Arc<str>,
     #[serde(rename = "tracks")]
     #[serde(deserialize_with = "deserialize_track_count")]
@@ -89,3 +92,12 @@ where
 
     Ok(PlaylistTracksRef::deserialize(deserializer)?.total)
 }
+
+fn deserialize_sanitized_description<'de, D>(deserializer: D) -> Result<Arc<str>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let description: String = String::deserialize(deserializer)?;
+    let sanitized = sanitize_str(&DEFAULT, &description).unwrap_or_default();
+    Ok(Arc::from(sanitized.replace("&amp;", "&")))
+}

psst-gui/src/webapi/client.rs

@@ -1204,15 +1204,6 @@ impl WebApi {
     pub fn get_playlists(&self) -> Result<Vector<Playlist>, Error> {
         let request = self.get("v1/me/playlists", None)?;
         let result: Vector<Playlist> = self.load_all_pages(request)?;
-
-        let result = result
-            .into_iter()
-            .map(|mut playlist| {
-                playlist.description = Self::sanitize_html(&playlist.description).into();
-                playlist
-            })
-            .collect();
-
         Ok(result)
     }
 
@@ -1231,8 +1222,7 @@ impl WebApi {
     // https://developer.spotify.com/documentation/web-api/reference/get-playlist
     pub fn get_playlist(&self, id: &str) -> Result<Playlist, Error> {
         let request = self.get(format!("v1/playlists/{}", id), None)?;
-        let mut result: Playlist = self.load(request)?;
-        result.description = Self::sanitize_html(&result.description).into();
+        let result: Playlist = self.load(request)?;
         Ok(result)
     }