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
/**
* @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, $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();
+ }
}
}