Merge pull request #23415 from nextcloud/bugfix/23304/some-emojis-are-in-general-other-types

rullzer · web-flow · commit 8355f95beff4 · 2020-10-19T15:05:34.000+02:00
Some emojis are in CHAR_CATEGORY_GENERAL_OTHER_TYPES
diff --git a/apps/user_status/lib/Service/EmojiService.php b/apps/user_status/lib/Service/EmojiService.php
@@ -81,7 +81,8 @@ public function isValidEmoji(string $emoji): bool {
 			// just continue and check the next character
 			if ($codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_SYMBOL ||
 				$codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_LETTER ||
-				$codePointType === \IntlChar::CHAR_CATEGORY_OTHER_SYMBOL) {
+				$codePointType === \IntlChar::CHAR_CATEGORY_OTHER_SYMBOL ||
+				$codePointType === \IntlChar::CHAR_CATEGORY_GENERAL_OTHER_TYPES) {
 				continue;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public function isValidEmoji(string $emoji): bool {`
`81`	`81`	`// just continue and check the next character`
`82`	`82`	`if ($codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_SYMBOL \|\|`
`83`	`83`	`$codePointType === \IntlChar::CHAR_CATEGORY_MODIFIER_LETTER \|\|`
`84`		`- $codePointType === \IntlChar::CHAR_CATEGORY_OTHER_SYMBOL) {`
	`84`	`+ $codePointType === \IntlChar::CHAR_CATEGORY_OTHER_SYMBOL \|\|`
	`85`	`+ $codePointType === \IntlChar::CHAR_CATEGORY_GENERAL_OTHER_TYPES) {`
`85`	`86`	`continue;`
`86`	`87`	`}`
`87`	`88`