Merge pull request #32220 from nextcloud/feature/add-tests-to-validat…

…e-emojis Include more emoji chars to test and fixes after include it
nextcloud · May 3, 2022 · 290697b · 290697b
2 parents fc826e9 + cefcd55
commit 290697b
Show file tree

Hide file tree

Showing 2 changed files with 3,097 additions and 16 deletions.
diff --git a/lib/private/EmojiHelper.php b/lib/private/EmojiHelper.php
@@ -60,13 +60,26 @@ public function isValidSingleEmoji(string $emoji): bool {
 		foreach ($codePointIterator->getPartsIterator() as $codePoint) {
 			$codePointType = \IntlChar::charType($codePoint);
 
-			// If the current code-point is an emoji or a modifier (like a skin-tone)
-			// 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_GENERAL_OTHER_TYPES) {
-				continue;
+			// Unicode chars need 2 or more chars
+			// The characterCount before this loop already validate if is a single emoji
+			// This condition is to don't continue if non emoji chars
+			if (strlen($emoji) >= 2) {
+				// If the current code-point is an emoji or a modifier (like a skin-tone)
+				// 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_FORMAT_CHAR ||          // i.e. 🏴󠁧󠁢󠁥󠁮󠁧󠁿 🏴󠁧󠁢󠁳󠁣󠁴󠁿
+					$codePointType === \IntlChar::CHAR_CATEGORY_OTHER_PUNCTUATION ||    // i.e. ‼️ ⁉️ #⃣
+					$codePointType === \IntlChar::CHAR_CATEGORY_LOWERCASE_LETTER ||     // i.e. ℹ️
+					$codePointType === \IntlChar::CHAR_CATEGORY_MATH_SYMBOL ||          // i.e. ↔️ ◻️ ⤴️ ⤵️
+					$codePointType === \IntlChar::CHAR_CATEGORY_ENCLOSING_MARK ||       // i.e. 0⃣..9⃣
+					$codePointType === \IntlChar::CHAR_CATEGORY_DECIMAL_DIGIT_NUMBER || // i.e. 0⃣..9⃣
+					$codePointType === \IntlChar::CHAR_CATEGORY_DASH_PUNCTUATION ||     // i.e. 〰️
+					$codePointType === \IntlChar::CHAR_CATEGORY_GENERAL_OTHER_TYPES
+				) {
+					continue;
+				}
 			}
 
 			// If it's neither a modifier nor an emoji, we only allow