X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FAPDelivery.php;h=634a9446ebfc85ba63a04805bc49ef9ebc6daf35;hb=066ad8c01b25b7101ad6fb36878d85c97db51a6f;hp=b952249fed11a120066de84a8fd27e382520ded0;hpb=9c9ebfc7c97016881d9ad2bb3c3b54a5640d2f08;p=friendica.git diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php index b952249fed..634a9446eb 100644 --- a/src/Worker/APDelivery.php +++ b/src/Worker/APDelivery.php @@ -5,9 +5,10 @@ namespace Friendica\Worker; use Friendica\BaseObject; -use Friendica\Protocol\ActivityPub; -use Friendica\Model\Item; +use Friendica\Core\Logger; use Friendica\Core\Worker; +use Friendica\Model\ItemDeliveryData; +use Friendica\Protocol\ActivityPub; use Friendica\Util\HTTPSignature; class APDelivery extends BaseObject @@ -15,30 +16,36 @@ class APDelivery extends BaseObject /** * @brief Delivers ActivityPub messages * - * @param string $cmd - * @param integer $item_id - * @param string $inbox + * @param string $cmd + * @param integer $target_id + * @param string $inbox * @param integer $uid + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function execute($cmd, $item_id, $inbox, $uid) + public static function execute($cmd, $target_id, $inbox, $uid) { - logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $inbox, LOGGER_DEBUG); + Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $inbox, Logger::DEBUG); $success = true; if ($cmd == Delivery::MAIL) { } elseif ($cmd == Delivery::SUGGESTION) { - $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_id); + $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $target_id); } elseif ($cmd == Delivery::RELOCATION) { } elseif ($cmd == Delivery::REMOVAL) { $success = ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox); } elseif ($cmd == Delivery::PROFILEUPDATE) { $success = ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox); } else { - $data = ActivityPub\Transmitter::createCachedActivityFromItem($item_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) {