Merge branch '2020.09-rc' into stable

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

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index a239ae7a1ac964f2b4b588501fc57a067a71e656..2c99132c2004bbfb0a3f90328f3a30623c905fe3 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 [];
                }
 
@@ -711,15 +712,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'])) {
@@ -745,7 +753,7 @@ class Processor
 
                $ldactivity['thread-completion'] = true;
 
-               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']]);