rename rawContent() to content()

[friendica.git] / src / Worker / APDelivery.php

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 2fabb4a4eb99fda461ee671db8d60021a4967097..25c1dfb71929a7269166b61c035ad05b248b0282 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -9,7 +9,6 @@ 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
@@ -21,6 +20,8 @@ class APDelivery extends BaseObject
         * @param integer $target_id
         * @param string  $inbox
         * @param integer $uid
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function execute($cmd, $target_id, $inbox, $uid)
        {
@@ -29,6 +30,10 @@ class APDelivery extends BaseObject
                $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) {
                        $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $target_id);
                } elseif ($cmd == Delivery::RELOCATION) {
@@ -40,10 +45,9 @@ 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, Delivery::COMMENT])) {
-                               ItemDeliveryData::incrementQueueDone($target_id);
+                               if ($success && in_array($cmd, [Delivery::POST, Delivery::COMMENT])) {
+                                       ItemDeliveryData::incrementQueueDone($target_id);
+                               }
                        }
                }