Santize home description (#575)

This was reverted in the past commit
jpochyla · Dec 29, 2024 · 8b9f719 · 8b9f719
1 parent fed45f5
commit 8b9f719
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/psst-gui/src/data/playlist.rs b/psst-gui/src/data/playlist.rs
@@ -1,10 +1,9 @@
 use std::sync::Arc;
 
 use druid::{im::Vector, Data, Lens};
-use sanitize_html::rules::predefined::DEFAULT;
-use sanitize_html::sanitize_str;
 use serde::{Deserialize, Deserializer, Serialize};
 
+use crate::data::utils::sanitize_html_string;
 use crate::data::{user::PublicUser, Image, Promise, Track, TrackId};
 
 #[derive(Clone, Debug, Data, Lens)]
@@ -98,6 +97,5 @@ 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;", "&")))
+    Ok(sanitize_html_string(&description))
 }
diff --git a/psst-gui/src/data/utils.rs b/psst-gui/src/data/utils.rs
@@ -6,6 +6,8 @@ use std::{
 };
 
 use druid::{im::Vector, Data, Lens};
+use sanitize_html::rules::predefined::DEFAULT;
+use sanitize_html::sanitize_str;
 use serde::{Deserialize, Deserializer, Serialize};
 use time::{Date, Month};
 
@@ -172,3 +174,8 @@ where
     let opt = Option::deserialize(deserializer)?;
     Ok(opt.unwrap_or_else(default_str))
 }
+
+pub fn sanitize_html_string(text: &str) -> Arc<str> {
+    let sanitized = sanitize_str(&DEFAULT, text).unwrap_or_default();
+    Arc::from(sanitized.replace("&amp;", "&"))
+}
diff --git a/psst-gui/src/webapi/client.rs b/psst-gui/src/webapi/client.rs
@@ -26,6 +26,7 @@ use psst_core::{
 };
 
 use crate::{
+    data::utils::sanitize_html_string,
     data::{
         self, Album, AlbumType, Artist, ArtistAlbums, ArtistInfo, ArtistLink, ArtistStats,
         AudioAnalysis, Cached, Episode, EpisodeId, EpisodeLink, Image, MixedView, Nav, Page,
@@ -486,21 +487,21 @@ impl WebApi {
                                     },
                                 )),
                                 description: {
-                                    let desc = item
-                                        .content
-                                        .data
-                                        .description
-                                        .as_deref()
-                                        .unwrap_or_default()
-                                        .to_string();
+                                    let desc = sanitize_html_string(
+                                        item.content
+                                            .data
+                                            .description
+                                            .as_deref()
+                                            .unwrap_or_default(),
+                                    );
+
                                     // This is roughly 3 lines of description, truncated if too long
                                     if desc.chars().count() > 55 {
-                                        desc.chars().take(52).collect::<String>() + "..."
+                                        Arc::from(desc.chars().take(52).collect::<String>() + "...")
                                     } else {
                                         desc
                                     }
-                                }
-                                .into(),
+                                },
                                 track_count: item.content.data.attributes.as_ref().and_then(
                                     |attrs| {
                                         attrs