From 20e934b025589e2356f668b3ef13b5caa0078739 Mon Sep 17 00:00:00 2001
From: Daniel Messer <cyberpunklibrarian@protonmail.com>
Date: Thu, 23 Apr 2026 19:46:08 -0400
Subject: [PATCH] Fixed UTF encoding issues

---
 index.php       | 28 +++++++++++++++-------------
 now_playing.php | 17 ++++++++++-------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/index.php b/index.php
index 84137f8..79b1010 100755
--- a/index.php
+++ b/index.php
@@ -70,19 +70,21 @@
 
 					<script>
 						function fetchNowPlaying() {
-							fetch('now_playing.php')
-							.then(response => response.text())
-							.then(data => {
-								document.getElementById('now-playing').innerHTML = data;
-								})
-							.catch(error => {
-								document.getElementById('now-playing').innerHTML = "Unable to load song data.";
-								console.error('Error fetching song data:', error);
-								});
-							}			
-							// Fetch immediately and then every 15 seconds
-							fetchNowPlaying();
-							setInterval(fetchNowPlaying, 15000);
+    						fetch('now_playing.php')
+    						.then(response => response.arrayBuffer())
+    						.then(buffer => {
+        						const decoder = new TextDecoder('utf-8');
+        						const data = decoder.decode(buffer);
+        						document.getElementById('now-playing').innerHTML = data;
+    						})
+    						.catch(error => {
+        						document.getElementById('now-playing').innerHTML = "Unable to load song data.";
+        						console.error('Error fetching song data:', error);
+							});
+						}
+					// Fetch immediately and then every 15 seconds
+					fetchNowPlaying();
+					setInterval(fetchNowPlaying, 15000);
 					</script>
 				</div>
 				<p><span style = "color:white;">Add <a href="https://radio.cyberpunklibrarian.nohost.me/rfe">Radio Free Elsewhere</a> to VLC or your favourite audio streaming app.</span></p>
diff --git a/now_playing.php b/now_playing.php
index 1f73004..fae167a 100644
--- a/now_playing.php
+++ b/now_playing.php
@@ -1,8 +1,8 @@
 <?php
-// Icecast server status URL
+header('Content-Type: text/html; charset=utf-8');
+
 $icecastStatusURL = "https://radio.cyberpunklibrarian.nohost.me/status-json.xsl";
 
-// Fetch the status JSON
 $response = @file_get_contents($icecastStatusURL);
 
 if ($response === FALSE) {
@@ -13,19 +13,22 @@ if ($response === FALSE) {
     if (isset($data['icestats']['source'])) {
         $source = $data['icestats']['source'];
 
-        // Ensure $source is treated as an array
         if (!is_array($source) || isset($source['title'])) {
             $currentStream = $source;
         } else {
-            $currentStream = $source[0]; // If multiple sources exist, take the first
+            $currentStream = $source[0];
         }
 
-        // Extract song metadata
         $currentSong = isset($currentStream['title']) ? $currentStream['title'] : 'No song metadata available';
 
-        echo htmlspecialchars($currentSong);
+        // Undo the double-encoding: strip the outer UTF-8 layer to recover
+        // the original correct UTF-8 byte sequence
+        $currentSong = mb_convert_encoding($currentSong, 'ISO-8859-1', 'UTF-8');
+
+        echo htmlspecialchars($currentSong, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+
     } else {
         echo "RFE is currently offline! Please check back later!";
     }
 }
-?>
+?>
\ No newline at end of file