Merge pull request #82 from iMattPro/emoji-issue

iMattPro · web-flow · commit 10ba38e42f40 · 2024-09-29T19:45:31.000-07:00
Decode Emoji
diff --git a/ucp/controller/webpush.php b/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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,10 @@ public function notification(): JsonResponse`
`105`	`105`
`106`	`106`	`$notification_data = $this->get_user_notifications();`
`107`	`107`
`108`		`- // Decode and return data if everything is fine`
	`108`	`+ // Decode and return data if everything is fine; update url paths and decode message emoji`
`109`	`109`	`$data = json_decode($notification_data, true);`
`110`	`110`	`$data['url'] = isset($data['url']) ? $this->path_helper->update_web_root_path($data['url']) : '';`
	`111`	`+ $data['text'] = isset($data['text']) ? html_entity_decode($data['text'], ENT_NOQUOTES, 'UTF-8') : '';`
`111`	`112`
`112`	`113`	`return new JsonResponse($data);`
`113`	`114`	`}`