Don't transmit to archived inboxes

[friendica.git] / src / Worker / APDelivery.php

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 609bb88886632b128eac4282db661eaabd9fa6e6..a25977372a3a2edd3168c0d2d2fe427d5c7c6123 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -42,7 +42,16 @@ class APDelivery
         */
        public static function execute($cmd, $target_id, $inbox, $uid)
        {
-               Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $inbox, Logger::DEBUG);
+               if (ActivityPub\Transmitter::archivedInbox($inbox)) {
+                       Logger::info('Inbox is archived', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $target_id, 'uid' => $uid]);
+                       if (in_array($cmd, [Delivery::POST])) {
+                               $item = Item::selectFirst(['uri-id'], ['id' => $target_id]);
+                               Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? 0);
+                       }
+                       return;
+               }
+
+               Logger::info('Invoked', ['cmd' => $cmd, 'inbox' => $inbox, 'id' => $target_id, 'uid' => $uid]);
 
                $success = true;
 
@@ -68,13 +77,14 @@ class APDelivery
                        }
                }
 
-               // This should never fail and is temporariy (until the move to )
+               // This should never fail and is temporariy (until the move to the "post" structure)
                $item = Item::selectFirst(['uri-id'], ['id' => $target_id]);
+               $uriid = $item['uri-id'] ?? 0;
 
                if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueFailed($item['uri-id']);
+                       Post\DeliveryData::incrementQueueFailed($uriid);
                } elseif ($success && in_array($cmd, [Delivery::POST])) {
-                       Post\DeliveryData::incrementQueueDone($item['uri-id'], Post\DeliveryData::ACTIVITYPUB);
+                       Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB);
                }
        }
 }