Merge pull request #9652 from annando/issue-9584

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

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 609bb88886632b128eac4282db661eaabd9fa6e6..7173475befa5117a635f06385bc21eedf6053fa8 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -23,6 +23,7 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
@@ -37,12 +38,22 @@ class APDelivery
         * @param integer $target_id
         * @param string  $inbox
         * @param integer $uid
+        * @param array   $receivers
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function execute($cmd, $target_id, $inbox, $uid)
+       public static function execute($cmd, $target_id, $inbox, $uid, $receivers = [])
        {
-               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 +79,27 @@ 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;
+
+               foreach ($receivers as $receiver) {
+                       $contact = Contact::getById($receiver);
+                       if (empty($contact)) {
+                               continue;
+                       }
+
+                       if ($success) {
+                               Contact::unmarkForArchival($contact);
+                       } else {
+                               Contact::markForArchival($contact);
+                       }
+               }
 
                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);
                }
        }
 }