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 3c12e45491813eab51952da2647e91d625937c52..92767a10589b2fa5d020e1fc89eff353d257b65c 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -1,20 +1,37 @@
 <?php
 /**
- * @file src/Worker/APDelivery.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Worker;
 
-use Friendica\BaseObject;
 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;
 
-class APDelivery extends BaseObject
+class APDelivery
 {
        /**
-        * @brief Delivers ActivityPub messages
+        * Delivers ActivityPub messages
         *
         * @param string  $cmd
         * @param integer $target_id
@@ -48,14 +65,17 @@ class APDelivery extends BaseObject
                        $data = ActivityPub\Transmitter::createCachedActivityFromItem($target_id);
                        if (!empty($data)) {
                                $success = HTTPSignature::transmit($data, $inbox, $uid);
-                               if ($success && in_array($cmd, [Delivery::POST])) {
-                                       ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::ACTIVITYPUB);
-                               }
                        }
                }
 
+               // 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])) {
+                       Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB);
                }
        }
 }