Replace item_id by target_id in multimode delivery workers

diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index ce82db249af324d5881d7c98d9a8458c37cf286d..268e45a4de9a4a5b98569adf559989b830026f34 100644 (file)
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -16,27 +16,27 @@ 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
         */
-       public static function execute($cmd, $item_id, $inbox, $uid)
+       public static function execute($cmd, $target_id, $inbox, $uid)
        {
-               Logger::log('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);
                        }

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index c6d24657e5aad2fe6c54f17434c5429b41d5f22d..65cdd79e9196b696f7eb621bad8c2477bb60c7e4 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -32,9 +32,9 @@ class Delivery extends BaseObject
        const REMOVAL       = 'removeme';
        const PROFILEUPDATE = 'profileupdate';
 
-       public static function execute($cmd, $item_id, $contact_id)
+       public static function execute($cmd, $target_id, $contact_id)
        {
-               Logger::log('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, Logger::DEBUG);
+               Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $contact_id, Logger::DEBUG);
 
                $top_level = false;
                $followup = false;
@@ -42,28 +42,28 @@ class Delivery extends BaseObject
 
                $items = [];
                if ($cmd == self::MAIL) {
-                       $target_item = DBA::selectFirst('mail', [], ['id' => $item_id]);
+                       $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
                        if (!DBA::isResult($target_item)) {
                                return;
                        }
                        $uid = $target_item['uid'];
                } elseif ($cmd == self::SUGGESTION) {
-                       $target_item = DBA::selectFirst('fsuggest', [], ['id' => $item_id]);
+                       $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
                        if (!DBA::isResult($target_item)) {
                                return;
                        }
                        $uid = $target_item['uid'];
                } elseif ($cmd == self::RELOCATION) {
-                       $uid = $item_id;
+                       $uid = $target_id;
                        $target_item = [];
                } else {
-                       $item = Item::selectFirst(['parent'], ['id' => $item_id]);
+                       $item = Item::selectFirst(['parent'], ['id' => $target_id]);
                        if (!DBA::isResult($item) || empty($item['parent'])) {
                                return;
                        }
                        $parent_id = intval($item['parent']);
 
-                       $condition = ['id' => [$item_id, $parent_id], 'moderated' => false];
+                       $condition = ['id' => [$target_id, $parent_id], 'moderated' => false];
                        $params = ['order' => ['id']];
                        $itemdata = Item::select([], $condition, $params);
 
@@ -71,7 +71,7 @@ class Delivery extends BaseObject
                                if ($item['id'] == $parent_id) {
                                        $parent = $item;
                                }
-                               if ($item['id'] == $item_id) {
+                               if ($item['id'] == $target_id) {
                                        $target_item = $item;
                                }
                                $items[] = $item;
@@ -79,12 +79,12 @@ class Delivery extends BaseObject
                        DBA::close($itemdata);
 
                        if (empty($target_item)) {
-                               Logger::log('Item ' . $item_id . "wasn't found. Quitting here.");
+                               Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
                                return;
                        }
 
                        if (empty($parent)) {
-                               Logger::log('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here.");
+                               Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
                                return;
                        }
 
@@ -107,7 +107,7 @@ class Delivery extends BaseObject
                        // When commenting too fast after delivery, a post wasn't recognized as top level post.
                        // The count then showed more than one entry. The additional check should help.
                        // The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
-                       if ((($parent['id'] == $item_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
+                       if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
                                Logger::log('Top level post');
                                $top_level = true;
                        }
@@ -148,7 +148,7 @@ class Delivery extends BaseObject
                }
 
                if (empty($items)) {
-                       Logger::log('No delivery data for  ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id);
+                       Logger::log('No delivery data for  ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id);
                }
 
                $owner = User::getOwnerDataById($uid);