nextcloud / server

lib/private/Comments/EmojiHelper.php

Indentation +64 added lines, -64 removed lines

@@ -34,68 +34,68 @@
  */
 class EmojiHelper {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/**
-	 * EmojiService constructor.
-	 *
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function doesPlatformSupportEmoji(): bool {
-		return $this->db->supports4ByteText() &&
-			\class_exists(\IntlBreakIterator::class);
-	}
-
-	/**
-	 * @param string $emoji
-	 * @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;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /**
+     * EmojiService constructor.
+     *
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
+
+    /**
+     * @return bool
+     */
+    public function doesPlatformSupportEmoji(): bool {
+        return $this->db->supports4ByteText() &&
+            \class_exists(\IntlBreakIterator::class);
+    }
+
+    /**
+     * @param string $emoji
+     * @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;
+    }
 }

lib/private/Comments/Manager.php

Indentation +1588 added lines, -1588 removed lines

@@ -47,1592 +47,1592 @@
 
 class Manager implements ICommentsManager {
 
-	/** @var  IDBConnection */
-	protected $dbConn;
-
-	/** @var  LoggerInterface */
-	protected $logger;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var EmojiHelper */
-	protected $emojiHelper;
-
-	/** @var IInitialStateService */
-	protected $initialStateService;
-
-	/** @var IComment[] */
-	protected $commentsCache = [];
-
-	/** @var  \Closure[] */
-	protected $eventHandlerClosures = [];
-
-	/** @var  ICommentsEventHandler[] */
-	protected $eventHandlers = [];
-
-	/** @var \Closure[] */
-	protected $displayNameResolvers = [];
-
-	public function __construct(IDBConnection $dbConn,
-								LoggerInterface $logger,
-								IConfig $config,
-								ITimeFactory $timeFactory,
-								EmojiHelper $emojiHelper,
-								IInitialStateService $initialStateService) {
-		$this->dbConn = $dbConn;
-		$this->logger = $logger;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		$this->emojiHelper = $emojiHelper;
-		$this->initialStateService = $initialStateService;
-	}
-
-	/**
-	 * converts data base data into PHP native, proper types as defined by
-	 * IComment interface.
-	 *
-	 * @param array $data
-	 * @return array
-	 */
-	protected function normalizeDatabaseData(array $data) {
-		$data['id'] = (string)$data['id'];
-		$data['parent_id'] = (string)$data['parent_id'];
-		$data['topmost_parent_id'] = (string)$data['topmost_parent_id'];
-		$data['creation_timestamp'] = new \DateTime($data['creation_timestamp']);
-		if (!is_null($data['latest_child_timestamp'])) {
-			$data['latest_child_timestamp'] = new \DateTime($data['latest_child_timestamp']);
-		}
-		$data['children_count'] = (int)$data['children_count'];
-		$data['reference_id'] = $data['reference_id'] ?? null;
-		if ($this->supportReactions()) {
-			$list = json_decode($data['reactions'], true);
-			// Ordering does not work on the database with group concat and Oracle,
-			// So we simply sort on the output.
-			if (is_array($list)) {
-				uasort($list, static function ($a, $b) {
-					if ($a === $b) {
-						return 0;
-					}
-					return ($a > $b) ? -1 : 1;
-				});
-			}
-			$data['reactions'] = $list;
-		}
-		return $data;
-	}
-
-
-	/**
-	 * @param array $data
-	 * @return IComment
-	 */
-	public function getCommentFromData(array $data): IComment {
-		return new Comment($this->normalizeDatabaseData($data));
-	}
-
-	/**
-	 * prepares a comment for an insert or update operation after making sure
-	 * all necessary fields have a value assigned.
-	 *
-	 * @param IComment $comment
-	 * @return IComment returns the same updated IComment instance as provided
-	 *                  by parameter for convenience
-	 * @throws \UnexpectedValueException
-	 */
-	protected function prepareCommentForDatabaseWrite(IComment $comment) {
-		if (!$comment->getActorType()
-			|| $comment->getActorId() === ''
-			|| !$comment->getObjectType()
-			|| $comment->getObjectId() === ''
-			|| !$comment->getVerb()
-		) {
-			throw new \UnexpectedValueException('Actor, Object and Verb information must be provided for saving');
-		}
-
-		if ($comment->getVerb() === 'reaction' && !$this->emojiHelper->isValidEmoji($comment->getMessage())) {
-			// 4 characters: laptop + person + gender + skin color => "