Remove entries from queue / relay detection

[friendica.git] / src / Protocol / ActivityPub / Transmitter.php

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index b669a9f70dc74bd8eaaac965478cdb0b6b1c6a07..a9c163964e0c5ca74983bbf2f99b009aebb5aba4 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -916,7 +916,13 @@ class Transmitter
                        $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
                }
 
-               $condition = ['uid' => $uid, 'archive' => false, 'pending' => false, 'blocked' => false, 'network' => Protocol::FEDERATED];
+               $condition = [
+                       'uid' => $uid,
+                       'archive' => false,
+                       'pending' => false,
+                       'blocked' => false,
+                       'network' => Protocol::FEDERATED,
+               ];
 
                if (!empty($uid)) {
                        $condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
@@ -1184,10 +1190,10 @@ class Transmitter
         *
         * @param integer $item_id Item id
         * @param boolean $force Force new cache entry
-        * @return array with the activity
+        * @return array|false activity or false on failure
         * @throws \Exception
         */
-       public static function createCachedActivityFromItem(int $item_id, bool $force = false): array
+       public static function createCachedActivityFromItem(int $item_id, bool $force = false)
        {
                $cachekey = 'APDelivery:createActivity:' . $item_id;
 
@@ -1265,7 +1271,7 @@ class Transmitter
                }
 
                if ($type == 'Delete') {
-                       $data['id'] = Item::newURI($item['uid'], $item['guid']) . '/' . $type;;
+                       $data['id'] = Item::newURI($item['guid']) . '/' . $type;;
                } elseif (($item['gravity'] == GRAVITY_ACTIVITY) && ($type != 'Undo')) {
                        $data['id'] = $item['uri'];
                } else {
@@ -2155,14 +2161,14 @@ class Transmitter
        /**
         * Reject a contact request or terminates the contact relation
         *
-        * @param string  $target Target profile
-        * @param integer $id Object id
-        * @param integer $uid    User ID
+        * @param string $target   Target profile
+        * @param string $objectId Object id
+        * @param int    $uid      User ID
         * @return bool Operation success
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function sendContactReject(string $target, int $id, int $uid): bool
+       public static function sendContactReject(string $target, string $objectId, int $uid): bool
        {
                $profile = APContact::getByURL($target);
                if (empty($profile['inbox'])) {
@@ -2175,9 +2181,9 @@ class Transmitter
                        '@context' => ActivityPub::CONTEXT,
                        'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
                        'type' => 'Reject',
-                       'actor' => $owner['url'],
+                       'actor'  => $owner['url'],
                        'object' => [
-                               'id' => (string)$id,
+                               'id' => $objectId,
                                'type' => 'Follow',
                                'actor' => $profile['url'],
                                'object' => $owner['url']
@@ -2186,7 +2192,7 @@ class Transmitter
                        'to' => [$profile['url']],
                ];
 
-               Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id);
+               Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
 
                $signed = LDSignature::sign($data, $owner);
                return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
@@ -2216,12 +2222,12 @@ class Transmitter
                        return false;
                }
 
-               $id = DI::baseUrl() . '/activity/' . System::createGUID();
+               $objectId = DI::baseUrl() . '/activity/' . System::createGUID();
 
                $owner = User::getOwnerDataById($uid);
                $data = [
                        '@context' => ActivityPub::CONTEXT,
-                       'id' => $id,
+                       'id' => $objectId,
                        'type' => 'Undo',
                        'actor' => $owner['url'],
                        'object' => [
@@ -2234,7 +2240,7 @@ class Transmitter
                        'to' => [$profile['url']],
                ];
 
-               Logger::info('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id);
+               Logger::info('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
 
                $signed = LDSignature::sign($data, $owner);
                return HTTPSignature::transmit($signed, $profile['inbox'], $uid);