From f9e2b1dea7f862a1be5495ad86043fc1bff6439b Mon Sep 17 00:00:00 2001
From: Ibrahim Issa <ibrahimisssaa@gmail.com>
Date: Tue, 28 Jul 2026 13:48:40 +0200
Subject: [PATCH] fix(mpris): sanitize metadata to prevent multiline UI
 expansion

---
 src/modules/mpris/mpris.cpp | 48 +++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/modules/mpris/mpris.cpp b/src/modules/mpris/mpris.cpp
index d079a898a..e9b87e3fc 100644
--- a/src/modules/mpris/mpris.cpp
+++ b/src/modules/mpris/mpris.cpp
@@ -543,34 +543,40 @@ auto Mpris::getPlayerInfo() -> std::optional<PlayerInfo> {
       .length = std::nullopt,
   };
 
-  if (auto* artist_ = playerctl_player_get_artist(last_active_player_, &error)) {
-    spdlog::debug("mpris[{}]: artist = {}", info.name, artist_);
-    info.artist = artist_;
-    g_free(artist_);
+  auto sanitize = [ ]( char* raw_str ) {
+      std::string s( raw_str );
+      std::replace( s.begin(), s.end(), '\n', ' ' );
+      std::replace( s.begin(), s.end(), '\r', ' ' );
+      return s;
+    };
+
+if(auto* artist_ = playerctl_player_get_artist( last_active_player_, &error )) {
+    spdlog::debug( "mpris[{}]: artist = {}", info.name, artist_ );
+    info.artist = sanitize( artist_ );
+    g_free( artist_ );
   }
-  if (error) goto errorexit;
+  if(error) goto errorexit;
 
-  if (auto* album_artist_ =
-          playerctl_player_print_metadata_prop(last_active_player_, "xesam:albumArtist", &error)) {
-    spdlog::debug("mpris[{}]: albumArtist = {}", info.name, album_artist_);
-    info.album_artist = album_artist_;
-    g_free(album_artist_);
+  if(auto* album_artist_ = playerctl_player_print_metadata_prop( last_active_player_, "xesam:albumArtist", &error )) {
+    spdlog::debug( "mpris[{}]: albumArtist = {}", info.name, album_artist_ );
+    info.album_artist = sanitize( album_artist_ );
+    g_free( album_artist_ );
   }
-  if (error) goto errorexit;
+  if(error) goto errorexit;
 
-  if (auto* album_ = playerctl_player_get_album(last_active_player_, &error)) {
-    spdlog::debug("mpris[{}]: album = {}", info.name, album_);
-    info.album = album_;
-    g_free(album_);
+  if(auto* album_ = playerctl_player_get_album( last_active_player_, &error )) {
+    spdlog::debug( "mpris[{}]: album = {}", info.name, album_ );
+    info.album = sanitize( album_ );
+    g_free( album_ );
   }
-  if (error) goto errorexit;
+  if(error) goto errorexit;
 
-  if (auto* title_ = playerctl_player_get_title(last_active_player_, &error)) {
-    spdlog::debug("mpris[{}]: title = {}", info.name, title_);
-    info.title = title_;
-    g_free(title_);
+  if(auto* title_ = playerctl_player_get_title( last_active_player_, &error )) {
+    spdlog::debug( "mpris[{}]: title = {}", info.name, title_ );
+    info.title = sanitize( title_ );
+    g_free( title_ );
   }
-  if (error) goto errorexit;
+  if(error) goto errorexit;
 
   if (auto* length_ =
           playerctl_player_print_metadata_prop(last_active_player_, "mpris:length", &error)) {