<?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\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
$data = ActivityPub\Transmitter::createCachedActivityFromItem($target_id);
if (!empty($data)) {
$success = HTTPSignature::transmit($data, $inbox, $uid);
- if ($success && in_array($cmd, [Delivery::POST, Delivery::COMMENT])) {
- ItemDeliveryData::incrementQueueDone($target_id);
- }
}
}
- if (!$success) {
- Worker::defer();
+ if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) {
+ ItemDeliveryData::incrementQueueFailed($target_id);
+ } elseif ($success && in_array($cmd, [Delivery::POST])) {
+ ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::ACTIVITYPUB);
}
}
}