Silently quit on unfollow of invalid contacts

[friendica.git] / src / Core / Protocol.php

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 5687fa623d4d62cbe258040898bcc2c5b2eeb6eb..511954c7f93a14fd0685e08cb5373b14a947fba2 100644 (file)
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,7 @@
 namespace Friendica\Core;
 
 use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
@@ -140,7 +140,7 @@ class Protocol
                        // create a follow slap
                        $item = [
                                'verb'    => Activity::FOLLOW,
-                               'gravity' => GRAVITY_ACTIVITY,
+                               'gravity' => Item::GRAVITY_ACTIVITY,
                                'follow'  => $contact['url'],
                                'body'    => '',
                                'title'   => '',
@@ -171,18 +171,19 @@ class Protocol
        }
 
        /**
-        * Sends an unfriend message. Does not remove the contact
+        * Sends an unfollow message. Does not remove the contact
         *
-        * @param array   $user    User unfriending
-        * @param array   $contact Contact unfriended
+        * @param array $contact Target public contact (uid = 0) array
+        * @param array $user    Source local user array
         * @return bool|null true if successful, false if not, null if no remote action was performed
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function terminateFriendship(array $user, array $contact): ?bool
+       public static function unfollow(array $contact, array $user): ?bool
        {
                if (empty($contact['network'])) {
-                       throw new \InvalidArgumentException('Missing network key in contact array');
+                       Logger::notice('Contact has got no network, we quit here', ['id' => $contact['id']]);
+                       return true;
                }
 
                $protocol = $contact['network'];
@@ -192,18 +193,21 @@ class Protocol
 
                if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
                        // create an unfollow slap
-                       $item = [];
-                       $item['verb'] = Activity::O_UNFOLLOW;
-                       $item['gravity'] = GRAVITY_ACTIVITY;
-                       $item['follow'] = $contact['url'];
-                       $item['body'] = '';
-                       $item['title'] = '';
-                       $item['guid'] = '';
-                       $item['uri-id'] = 0;
+                       $item = [
+                               'verb'    => Activity::O_UNFOLLOW,
+                               'gravity' => Item::GRAVITY_ACTIVITY,
+                               'follow'  => $contact['url'],
+                               'body'    => '',
+                               'title'   => '',
+                               'guid'    => '',
+                               'uri-id'  => 0,
+                       ];
+
                        $slap = OStatus::salmon($item, $user);
 
                        if (empty($contact['notify'])) {
-                               throw new \InvalidArgumentException('Missing expected "notify" key in OStatus/DFRN contact');
+                               Logger::notice('OStatus/DFRN Contact is missing notify, we quit here', ['id' => $contact['id']]);
+                               return true;
                        }
 
                        return Salmon::slapper($user, $contact['notify'], $slap) === 0;
@@ -216,7 +220,8 @@ class Protocol
                // Catch-all hook for connector addons
                $hook_data = [
                        'contact' => $contact,
-                       'result' => null
+                       'uid'     => $user['uid'],
+                       'result'  => null,
                ];
                Hook::callAll('unfollow', $hook_data);
 
@@ -226,12 +231,13 @@ class Protocol
        /**
         * Revoke an incoming follow from the provided contact
         *
-        * @param array $contact Private contact (uid != 0) array
+        * @param array $contact Target public contact (uid == 0) array
+        * @param int   $uid     Source local user id
         * @return bool|null true if successful, false if not, null if no action was performed
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function revokeFollow(array $contact): ?bool
+       public static function revokeFollow(array $contact, int $uid): ?bool
        {
                if (empty($contact['network'])) {
                        throw new \InvalidArgumentException('Missing network key in contact array');
@@ -243,13 +249,14 @@ class Protocol
                }
 
                if ($protocol == Protocol::ACTIVITYPUB) {
-                       return ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $contact['uid']);
+                       return ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $uid);
                }
 
                // Catch-all hook for connector addons
                $hook_data = [
                        'contact' => $contact,
-                       'result' => null,
+                       'uid'     => $uid,
+                       'result'  => null,
                ];
                Hook::callAll('revoke_follow', $hook_data);