Merge pull request #8147 from annando/fetch-post

Fix for AP posts where the URL don't match

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 38557c52cea7f5e60f7b568bea5cc4138cc2e390..47af3d5a69b9e2afdf9a004c9b40fc9638a6dd42 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3759,8 +3759,8 @@ class Item
                        return $item_id;
                }
 
-               if (ActivityPub\Processor::fetchMissingActivity($uri)) {
-                       $item_id = self::searchByLink($uri, $uid);
+               if ($fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri)) {
+                       $item_id = self::searchByLink($fetched_uri, $uid);
                } else {
                        $item_id = Diaspora::fetchByURL($uri);
                }

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 0d6991c07262d8e6500cf0422a1411acdf4148d1..9267943d5eb8c9218c4f96509854a844570d8e88 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -591,7 +591,7 @@ class Processor
         *
         * @param string $url message URL
         * @param array $child activity array with the child of this message
-        * @return boolean success
+        * @return string fetched message URL
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function fetchMissingActivity($url, $child = [])
@@ -605,12 +605,12 @@ class Processor
                $object = ActivityPub::fetchContent($url, $uid);
                if (empty($object)) {
                        Logger::log('Activity ' . $url . ' was not fetchable, aborting.');
-                       return false;
+                       return '';
                }
 
                if (empty($object['id'])) {
                        Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object));
-                       return false;
+                       return '';
                }
 
                if (!empty($child['author'])) {
@@ -648,9 +648,9 @@ class Processor
                $ldactivity['thread-completion'] = true;
 
                ActivityPub\Receiver::processActivity($ldactivity);
-               Logger::log('Activity ' . $url . ' had been fetched and processed.');
+               Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);
 
-               return true;
+               return $activity['id'];
        }
 
        /**