Merge pull request #9146 from tobiasd/2020.09-CHANGELOG

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

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index d5164b5cc326522bd7e5e9bbeb3200343a093c75..6910ee11c227d175ad3eae2324a0ac097805f22e 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -181,6 +181,13 @@ class Receiver
                }
 
                Processor::fetchMissingActivity($object_id);
+
+               $item_id = Item::searchByLink($object_id);
+               if ($item_id) {
+                       Logger::info('Relayed message had been fetched and stored', ['id' => $object_id, 'item' => $item_id]);
+               } else {
+                       Logger::notice('Relayed message had not been stored', ['id' => $object_id]);
+               }
        }
 
        /**
@@ -480,6 +487,10 @@ class Receiver
                                        $object_data['thread-completion'] = true;
 
                                        $item = ActivityPub\Processor::createItem($object_data);
+                                       if (empty($item)) {
+                                               return;
+                                       }
+
                                        $item['post-type'] = Item::PT_ANNOUNCEMENT;
                                        ActivityPub\Processor::postItem($object_data, $item);