Merge pull request #9255 from MrPetovan/bug/fatal-errors

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index a239ae7a1ac964f2b4b588501fc57a067a71e656..037c7889cb0be8e04a6de1fbd9039495d911b5c3 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -272,6 +272,7 @@ class Processor
 
                $item = self::processContent($activity, $item);
                if (empty($item)) {
+                       Logger::info('Message was not processed');
                        return [];
                }
 
@@ -520,6 +521,14 @@ class Processor
                                        $item['post-type'] = Item::PT_ARTICLE;
                        }
 
+                       if (in_array($item['post-type'], [Item::PT_COMMENT, Item::PT_GLOBAL, Item::PT_ARTICLE])) {
+                               if (!empty($activity['from-relay'])) {
+                                       $item['post-type'] = Item::PT_RELAY;
+                               } elseif (!empty($activity['thread-completion'])) {
+                                       $item['post-type'] = Item::PT_FETCHED;
+                               }
+                       }
+
                        if ($item['isForum'] ?? false) {
                                $item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver);
                        } else {
@@ -687,12 +696,13 @@ class Processor
        /**
         * Fetches missing posts
         *
-        * @param string $url message URL
-        * @param array $child activity array with the child of this message
+        * @param string $url   message URL
+        * @param array  $child activity array with the child of this message
+        * @param string $actor Relay actor
         * @return string fetched message URL
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function fetchMissingActivity(string $url, array $child = [])
+       public static function fetchMissingActivity(string $url, array $child = [], string $actor = '')
        {
                if (!empty($child['receiver'])) {
                        $uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
@@ -711,15 +721,22 @@ class Processor
                        return '';
                }
 
-               if (!empty($child['author'])) {
-                       $actor = $child['author'];
-               } elseif (!empty($object['actor'])) {
-                       $actor = $object['actor'];
+               if (!empty($object['actor'])) {
+                       $object_actor = $object['actor'];
                } elseif (!empty($object['attributedTo'])) {
-                       $actor = $object['attributedTo'];
+                       $object_actor = $object['attributedTo'];
                } else {
                        // Shouldn't happen
-                       $actor = '';
+                       $object_actor = '';
+               }
+
+               $signer = [$object_actor];
+
+               if (!empty($child['author'])) {
+                       $actor = $child['author'];
+                       $signer[] = $actor;
+               } else {
+                       $actor = $object_actor;
                }
 
                if (!empty($object['published'])) {
@@ -744,8 +761,9 @@ class Processor
                $ldactivity = JsonLD::compact($activity);
 
                $ldactivity['thread-completion'] = true;
+               $ldactivity['from-relay'] = !empty($actor);
 
-               ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, [$actor]);
+               ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer);
 
                Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);