Merge pull request #7000 from MrPetovan/task/6999-no-probe-magic-link

[friendica.git] / src / Protocol / ActivityPub / Processor.php

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 9fa16a91f72a32488cb976c908160f859e6fa936..475ccfc0b22048f66a4aa1b6b43c3b547a380530 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -48,7 +48,7 @@ class Processor
         *
         * @return string with replaced emojis
         */
-       public static function replaceEmojis($body, array $emojis)
+       private static function replaceEmojis($body, array $emojis)
        {
                foreach ($emojis as $emoji) {
                        $replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
@@ -252,7 +252,7 @@ class Processor
         *
         * @param array $activity Activity array
         * @param array $item
-        * @return array
+        * @return array|bool Returns the item array or false if there was an unexpected occurrence
         * @throws \Exception
         */
        private static function processContent($activity, $item)
@@ -263,13 +263,18 @@ class Processor
                        $item['body'] = $activity['source'];
                } else {
                        $content = HTML::toBBCode($activity['content']);
-                       $content = self::replaceEmojis($content, $activity['emojis']);
+
+                       if (!empty($activity['emojis'])) {
+                               $content = self::replaceEmojis($content, $activity['emojis']);
+                       }
+
                        $content = self::convertMentions($content);
 
                        if (($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
                                $item_private = !in_array(0, $activity['item_receiver']);
                                $parent = Item::selectFirst(['id', 'private', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
                                if (!DBA::isResult($parent)) {
+                                       Logger::warning('Unknown parent item.', ['uri' => $item['thr-parent']]);
                                        return false;
                                }
                                if ($item_private && !$parent['private']) {