Skip to content

[stable24] Replace isValidEmoji by method in EmojiHelper #32437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
May 16, 2022
Merged

[stable24] Replace isValidEmoji by method in EmojiHelper #32437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 3 additions & 38 deletions apps/user_status/lib/Service/EmojiService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/
namespace OCA\UserStatus\Service;

use OC\Comments\EmojiHelper;
use OCP\IDBConnection;

/**
Expand Down Expand Up @@ -60,43 +61,7 @@ public function doesPlatformSupportEmoji(): bool {
* @return bool
*/
public function isValidEmoji(string $emoji): bool {
$intlBreakIterator = \IntlBreakIterator::createCharacterInstance();
$intlBreakIterator->setText($emoji);

$characterCount = 0;
while ($intlBreakIterator->next() !== \IntlBreakIterator::DONE) {
$characterCount++;
}

if ($characterCount !== 1) {
return false;
}

$codePointIterator = \IntlBreakIterator::createCodePointInstance();
$codePointIterator->setText($emoji);

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;
}

// If it's neither a modifier nor an emoji, we only allow
// a zero-width-joiner or a variation selector 16
$codePointValue = \IntlChar::ord($codePoint);
if ($codePointValue === 8205 || $codePointValue === 65039) {
continue;
}

return false;
}

return true;
$emojiHelper = new EmojiHelper($this->db);
return $emojiHelper->isValidEmoji($emoji);
}
}