Merge branch 'main' into prep-1.0.1

Author: iMattPro

.github/workflows/tests.yml

@@ -347,7 +347,7 @@ jobs:
 
     # START Other Tests Job (SQLite 3 and mssql)
     other-tests:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
         strategy:
             matrix:
                 include:

ucp/controller/webpush.php

@@ -105,9 +105,10 @@ public function notification(): JsonResponse
 
 		$notification_data = $this->get_user_notifications();
 
-		// Decode and return data if everything is fine
+		// Decode and return data if everything is fine; update url paths and decode message emoji
 		$data = json_decode($notification_data, true);
 		$data['url'] = isset($data['url']) ? $this->path_helper->update_web_root_path($data['url']) : '';
+		$data['text'] = isset($data['text']) ? html_entity_decode($data['text'], ENT_NOQUOTES, 'UTF-8') : '';
 
 		return new JsonResponse($data);
 	}