Only store the inbox-queue on activated background processing

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index e3e2e295af56580ea1252c5c7ec280761a04b102..96308ca2cfdec3cc6c487ce20f96c4e5348cdd46 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -311,7 +311,9 @@ class Processor
                                $result = self::fetchMissingActivity($activity['reply-to-id'], $activity, '', Receiver::COMPLETION_AUTO);
                                if (empty($result) && self::isActivityGone($activity['reply-to-id'])) {
                                        // Recursively delete this and all depending entries
-                                       Queue::deleteById($activity['entry-id']);
+                                       if (!empty($activity['entry-id'])) {
+                                               Queue::deleteById($activity['entry-id']);
+                                       }
                                        return [];
                                }
                                $fetch_by_worker = empty($result);
@@ -366,9 +368,10 @@ class Processor
 
                if (!empty($activity['raw'])) {
                        $item['source'] = $activity['raw'];
-                       $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
                }
 
+               $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
+
                if (isset($activity['push'])) {
                        $item['direction'] = $activity['push'] ? Conversation::PUSH : Conversation::PULL;
                }

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 2231d0acbd3f8e673746f0097111b9a53c2eb45a..1d337f28af3d80c4b215338f9941b61c3d66e561 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -583,7 +583,7 @@ class Receiver
                        $object_data['object_activity'] = $activity;
                }
 
-               if ($trust_source || DI::config()->get('debug', 'ap_inbox_store_untrusted')) {
+               if (DI::config()->get('system', 'decoupled_receiver') && ($trust_source || DI::config()->get('debug', 'ap_inbox_store_untrusted'))) {
                        $object_data = Queue::add($object_data, $type, $uid, $http_signer, $push, $trust_source);
                }