Merge pull request #10798 from annando/q-calls

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

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index e7bb20893bc1f7d8d6b71dd7f93816ab58f5385b..d84baa55588e55bdaff1a26a3803eefca112c179 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -115,7 +115,7 @@ class Transmitter
                $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact['id']);
                $success = ActivityPub\Transmitter::sendActivity('Follow', $url, 0, $activity_id);
                if ($success) {
-                       DBA::update('contact', ['rel' => Contact::FRIEND], ['id' => $contact['id']]);
+                       Contact::update(['rel' => Contact::FRIEND], ['id' => $contact['id']]);
                }
 
                return $success;
@@ -137,7 +137,7 @@ class Transmitter
 
                $success = self::sendContactUndo($url, $contact['id'], 0);
                if ($success || $force) {
-                       DBA::update('contact', ['rel' => Contact::NOTHING], ['id' => $contact['id']]);
+                       Contact::update(['rel' => Contact::NOTHING], ['id' => $contact['id']]);
                }
 
                return $success;
@@ -2047,15 +2047,16 @@ class Transmitter
         * @param string  $target Target profile
         * @param         $id
         * @param integer $uid    User ID
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @return bool Operation success
+        * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function sendContactReject($target, $id, $uid)
+       public static function sendContactReject($target, $id, $uid): bool
        {
                $profile = APContact::getByURL($target);
                if (empty($profile['inbox'])) {
                        Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
-                       return;
+                       return false;
                }
 
                $owner = User::getOwnerDataById($uid);
@@ -2075,7 +2076,7 @@ class Transmitter
                Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id);
 
                $signed = LDSignature::sign($data, $owner);
-               HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
        }
 
        /**