Merge pull request #9261 from annando/relay-distribution

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 54d61bd6eeae4ca0d3da8f2d8b77802ceab1a17a..5d5bfc0b1c20b80fb91f1fd7df99220a9f2ed5ba 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -521,8 +521,16 @@ class Processor
                                        $item['post-type'] = Item::PT_ARTICLE;
                        }
 
-                       if (in_array($item['post-type'], [Item::PT_GLOBAL, Item::PT_ARTICLE]) && !empty($activity['from-relay'])) {
-                               $item['post-type'] = Item::PT_RELAY;
+                       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 (!empty($activity['from-relay'])) {
+                               $item['causer-id'] = $activity['from-relay'];
                        }
 
                        if ($item['isForum'] ?? false) {
@@ -692,13 +700,13 @@ class Processor
        /**
         * Fetches missing posts
         *
-        * @param string $url       message URL
-        * @param array  $child     activity array with the child of this message
-        * @param bool   $relaymode Posts arrived via relay
+        * @param string $url         message URL
+        * @param array  $child       activity array with the child of this message
+        * @param string $relay_actor Relay actor
         * @return string fetched message URL
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function fetchMissingActivity(string $url, array $child = [], bool $relaymode = false)
+       public static function fetchMissingActivity(string $url, array $child = [], string $relay_actor = '')
        {
                if (!empty($child['receiver'])) {
                        $uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
@@ -757,7 +765,7 @@ class Processor
                $ldactivity = JsonLD::compact($activity);
 
                $ldactivity['thread-completion'] = true;
-               $ldactivity['from-relay'] = $relaymode;
+               $ldactivity['from-relay'] = Contact::getIdForURL($relay_actor);
 
                ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true, false, $signer);