Merge pull request #9327 from nupplaphil/task/security_restructure

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

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 60752896fc64b05c224504ecd78c355c4a8114dc..92767a10589b2fa5d020e1fc89eff353d257b65c 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -23,7 +23,8 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
-use Friendica\Model\ItemDeliveryData;
+use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
 
@@ -67,10 +68,14 @@ class APDelivery
                        }
                }
 
+               // 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])) {
-                       ItemDeliveryData::incrementQueueFailed($target_id);
+                       Post\DeliveryData::incrementQueueFailed($uriid);
                } elseif ($success && in_array($cmd, [Delivery::POST])) {
-                       ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::ACTIVITYPUB);
+                       Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB);
                }
        }
 }