fix: decode html entities in playlist description

aome510 · Jun 17, 2024 · e353395 · e353395
1 parent ba62607
commit e353395
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/spotify_player/Cargo.toml b/spotify_player/Cargo.toml
@@ -48,6 +48,7 @@ ttl_cache = "0.5.1"
 clap_complete = "4.5.1"
 which = "6.0.1"
 fuzzy-matcher = { version = "0.3.7", optional = true }
+html-escape = "0.2.13"
 
 [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies.winit]
 version = "0.30.0"

diff --git a/spotify_player/src/state/model.rs b/spotify_player/src/state/model.rs
@@ -3,6 +3,7 @@ use rspotify::model::CurrentPlaybackContext;
 pub use rspotify::model::{AlbumId, ArtistId, Id, PlaylistId, TrackId, UserId};
 
 use crate::utils::map_join;
+use html_escape::decode_html_entities;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 
@@ -403,10 +404,9 @@ impl From<rspotify_model::SimplifiedPlaylist> for Playlist {
 impl From<rspotify_model::FullPlaylist> for Playlist {
     fn from(playlist: rspotify_model::FullPlaylist) -> Self {
         // remove HTML tags from the description
-        // TODO: may also need to do HTML escaping here
         let re = regex::Regex::new("(<.*?>|</.*?>)").expect("valid regex");
         let desc = playlist.description.unwrap_or_default();
-        let desc = re.replace_all(&desc, "").to_string();
+        let desc = decode_html_entities(&re.replace_all(&desc, "")).to_string();
 
         Self {
             id: playlist.id,