X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FAPDelivery.php;h=25c1dfb71929a7269166b61c035ad05b248b0282;hb=ce3b1210640ce653ef91cbf033788474c1f88b0c;hp=7b1ad760557022e3144c5d03382cabfe53ed6ada;hpb=192c6c8d4fb1d99981b46acc9d99bb212b754466;p=friendica.git

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 7b1ad76055..25c1dfb719 100644
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -5,8 +5,10 @@
 namespace Friendica\Worker;
 
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
+use Friendica\Core\Worker;
+use Friendica\Model\ItemDeliveryData;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Model\Item;
 use Friendica\Util\HTTPSignature;
 
 class APDelivery extends BaseObject
@@ -14,28 +16,43 @@ 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) {
+			$data = ActivityPub\Transmitter::createActivityFromMail($target_id);
+			if (!empty($data)) {
+				$success = HTTPSignature::transmit($data, $inbox, $uid);
+			}
 		} elseif ($cmd == Delivery::SUGGESTION) {
-			ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_id);
+			$success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $target_id);
 		} elseif ($cmd == Delivery::RELOCATION) {
 		} elseif ($cmd == Delivery::REMOVAL) {
-			ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox);
+			$success = ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox);
 		} elseif ($cmd == Delivery::PROFILEUPDATE) {
-			ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox);
+			$success = ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox);
 		} else {
-			$data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id);
+			$data = ActivityPub\Transmitter::createCachedActivityFromItem($target_id);
 			if (!empty($data)) {
-				HTTPSignature::transmit($data, $inbox, $uid);
+				$success = HTTPSignature::transmit($data, $inbox, $uid);
+				if ($success && in_array($cmd, [Delivery::POST, Delivery::COMMENT])) {
+					ItemDeliveryData::incrementQueueDone($target_id);
+				}
 			}
 		}
+
+		if (!$success) {
+			Worker::defer();
+		}
 	}
 }