Process incoming relay posts / fix importing posts

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index a239ae7a1ac964f2b4b588501fc57a067a71e656..ec1404c0f9c394e2c2960977cb9b509eac33f81f 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -711,15 +711,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 +752,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']]);
 

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index ea239227270c18935734233dc21958edbf2e5e6d..05c3abc01b7e27aafc984de4971fcb1007e82106 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -88,17 +88,7 @@ class Receiver
         */
        public static function processInbox($body, $header, $uid)
        {
-               $http_signer = HTTPSignature::getSigner($body, $header);
-               if (empty($http_signer)) {
-                       Logger::warning('Invalid HTTP signature, message will be discarded.');
-                       return;
-               } else {
-                       Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
-               }
-
-               $signer = [$http_signer];
                $activity = json_decode($body, true);
-
                if (empty($activity)) {
                        Logger::warning('Invalid body.');
                        return;
@@ -108,6 +98,22 @@ class Receiver
 
                $actor = JsonLD::fetchElement($ldactivity, 'as:actor', '@id');
 
+               $apcontact = APContact::getByURL($actor);
+               if (!empty($apcontact) && ($apcontact['type'] == 'Application') && ($apcontact['nick'] == 'relay')) {
+                       self::processRelayPost($ldactivity);
+                       return;
+               }
+
+               $http_signer = HTTPSignature::getSigner($body, $header);
+               if (empty($http_signer)) {
+                       Logger::warning('Invalid HTTP signature, message will be discarded.');
+                       return;
+               } else {
+                       Logger::info('Valid HTTP signature', ['signer' => $http_signer]);
+               }
+
+               $signer = [$http_signer];
+
                Logger::info('Message for user ' . $uid . ' is from actor ' . $actor);
 
                if (LDSignature::isSigned($activity)) {
@@ -141,6 +147,40 @@ class Receiver
                self::processActivity($ldactivity, $body, $uid, $trust_source, true, $signer);
        }
 
+       /**
+        * Process incoming posts from relays
+        *
+        * @param array $activity
+        * @return void
+        */
+       private static function processRelayPost(array $activity)
+       {
+               $type = JsonLD::fetchElement($activity, '@type');
+               if (!$type) {
+                       Logger::info('Empty type', ['activity' => $activity]);
+                       return;
+               }
+
+               if ($type != 'as:Announce') {
+                       Logger::info('Not an announcement', ['activity' => $activity]);
+               }
+
+               $object_id = JsonLD::fetchElement($activity, 'as:object', '@id');
+               if (empty($object_id)) {
+                       Logger::info('No object id found', ['activity' => $activity]);
+               }
+
+               Logger::info('Got relayed message id', ['id' => $object_id]);
+
+               $item_id = Item::searchByLink($object_id);
+               if ($item_id) {
+                       Logger::info('Relayed message already exists', ['id' => $object_id, 'item' => $item_id]);
+                       return;
+               }
+
+               Processor::fetchMissingActivity($object_id);
+       }
+
        /**
         * Fetches the object type for a given object id
         *
@@ -438,6 +478,7 @@ class Receiver
                                        $object_data['thread-completion'] = true;
 
                                        $item = ActivityPub\Processor::createItem($object_data);
+                                       $item['post-type'] = Item::PT_ANNOUNCEMENT;
                                        ActivityPub\Processor::postItem($object_data, $item);
 
                                        $announce_object_data = self::processObject($activity);