Remove emoji symbols and pictographs from shortname

Signed-off-by: Matt Friedman <maf675@gmail.com>

Author: iMattPro

controller/manifest.php

@@ -15,6 +15,7 @@
 use phpbb\language\language;
 use phpbb\path_helper;
 use phpbb\user;
+use phpbb\webpushnotifications\json\sanitizer as json_sanitizer;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -65,7 +66,7 @@ public function handle(): JsonResponse
 
 		$manifest = [
 			'name'			=> $this->config['sitename'],
-			'short_name'	=> $this->config['pwa_short_name'] ?: utf8_substr(preg_replace('/[^\x21-\x7E]/', '', html_entity_decode($this->config['sitename'], ENT_QUOTES, 'UTF-8')), 0, 12),
+			'short_name'	=> $this->config['pwa_short_name'] ?: utf8_substr(preg_replace('/\s+/', '', json_sanitizer::strip_emoji($this->config['sitename'])), 0, 12),
 			'display'		=> 'standalone',
 			'orientation'	=> 'portrait',
 			'dir'			=> $this->language->lang('DIRECTION'),

event/listener.php

@@ -18,6 +18,7 @@
 use phpbb\template\template;
 use phpbb\user;
 use phpbb\webpushnotifications\form\form_helper;
+use phpbb\webpushnotifications\json\sanitizer as json_sanitizer;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -353,6 +354,6 @@ protected function can_use_notifications()
 	 */
 	protected function get_shortname($name)
 	{
-		return utf8_substr(preg_replace('/[^\x20-\x7E]/', '', $name), 0, 12);
+		return utf8_substr(preg_replace('/\s+/', '', json_sanitizer::strip_emoji($name)), 0, 12);
 	}
 }

json/sanitizer.php

@@ -51,4 +51,19 @@ public static function decode(string $json) : array
 		$data = json_decode($json, true);
 		return !empty($data) ? self::sanitize($data) : [];
 	}
+
+	/**
+	 * Remove emoji from a string
+	 *
+	 * @param string $string
+	 * @return string
+	 */
+	public static function strip_emoji(string $string) : string
+	{
+		return preg_replace(
+			'/[\x{1F000}-\x{1F9FF}]|[\x{2600}-\x{27FF}]/u',
+			'',
+			html_entity_decode($string, ENT_QUOTES, 'UTF-8')
+		);
+	}
 }