Merge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs

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

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index b7e881c7a334b907e0f90d38fe4e317e0a64c652..ce82db249af324d5881d7c98d9a8458c37cf286d 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -5,24 +5,45 @@
 namespace Friendica\Worker;
 
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
+use Friendica\Core\Worker;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Model\Item;
+use Friendica\Util\HTTPSignature;
 
 class APDelivery extends BaseObject
 {
-       public static function execute($cmd, $item_id, $inbox)
+       /**
+        * @brief Delivers ActivityPub messages
+        *
+        * @param string $cmd
+        * @param integer $item_id
+        * @param string $inbox
+        * @param integer $uid
+        */
+       public static function execute($cmd, $item_id, $inbox, $uid)
        {
-               logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $inbox, LOGGER_DEBUG);
+               Logger::log('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $inbox, Logger::DEBUG);
+
+               $success = true;
 
                if ($cmd == Delivery::MAIL) {
                } elseif ($cmd == Delivery::SUGGESTION) {
+                       $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_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 {
-                       $item = Item::selectFirst(['uid'], ['id' => $item_id]);
-                       $data = ActivityPub::createActivityFromItem($item_id);
-                       ActivityPub::transmit($data, $inbox, $item['uid']);
+                       $data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id);
+                       if (!empty($data)) {
+                               $success = HTTPSignature::transmit($data, $inbox, $uid);
+                       }
                }
 
-               return;
+               if (!$success) {
+                       Worker::defer();
+               }
        }
 }