Use appropriate "accept" values

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 99b1c0971f67dd31e3a282d5726a59cc4620a160..2c88e798dec792550100aab4dbfc0e05a4d0b42d 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -38,10 +38,6 @@ use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
-use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\Diaspora;
-use Friendica\Protocol\OStatus;
-use Friendica\Protocol\Salmon;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
@@ -840,12 +836,13 @@ class Contact
        /**
         * Revoke follow privileges of the remote user contact
         *
-        * @param array   $contact  Contact unfriended
-        * @return bool|null Whether the remote operation is successful or null if no remote operation was performed
+        * The local relationship is updated immediately, the eventual remote server is messaged in the background.
+        *
+        * @param array $contact User-specific contact array (uid != 0) to revoke the follow from
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function revokeFollow(array $contact): ?bool
+       public static function revokeFollow(array $contact): void
        {
                if (empty($contact['network'])) {
                        throw new \InvalidArgumentException('Empty network in contact array');
@@ -855,19 +852,12 @@ class Contact
                        throw new \InvalidArgumentException('Unexpected public contact record');
                }
 
-               $result = Protocol::revokeFollow($contact);
-
-               // A null value here means the remote network doesn't support explicit follow revocation, we can still
-               // break the locally recorded relationship
-               if ($result !== false) {
-                       if ($contact['rel'] == self::FRIEND) {
-                               self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
-                       } else {
-                               self::remove($contact['id']);
-                       }
+               if (in_array($contact['rel'], [self::FOLLOWER, self::FRIEND])) {
+                       $cdata = Contact::getPublicAndUserContactID($contact['id'], $contact['uid']);
+                       Worker::add(PRIORITY_HIGH, 'Contact\RevokeFollow', $cdata['public'], $contact['uid']);
                }
 
-               return $result;
+               self::removeFollower($contact);
        }
 
        /**
@@ -2623,7 +2613,7 @@ class Contact
                        return false;
                }
 
-               $fields = ['url', 'name', 'nick', 'avatar', 'photo', 'network', 'blocked'];
+               $fields = ['id', 'url', 'name', 'nick', 'avatar', 'photo', 'network', 'blocked'];
                $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
                if (!DBA::isResult($pub_contact)) {
                        // Should never happen
@@ -2671,7 +2661,7 @@ class Contact
                        // Ensure to always have the correct network type, independent from the connection request method
                        self::updateFromProbe($contact['id']);
 
-                       Post\UserNotification::insertNotification($contact['id'], Activity::FOLLOW, $importer['uid']);
+                       Post\UserNotification::insertNotification($pub_contact['id'], Activity::FOLLOW, $importer['uid']);
 
                        return true;
                } else {
@@ -2702,7 +2692,7 @@ class Contact
 
                        self::updateAvatar($contact_id, $photo, true);
 
-                       Post\UserNotification::insertNotification($contact_id, Activity::FOLLOW, $importer['uid']);
+                       Post\UserNotification::insertNotification($pub_contact['id'], Activity::FOLLOW, $importer['uid']);
 
                        $contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
 
@@ -2722,9 +2712,7 @@ class Contact
 
                                Group::addMember(User::getDefaultGroup($importer['uid']), $contact_record['id']);
 
-                               if (($user['notify-flags'] & Notification\Type::INTRO) &&
-                                       in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
-
+                               if (($user['notify-flags'] & Notification\Type::INTRO) && $user['page-flags'] == User::PAGE_FLAGS_NORMAL) {
                                        DI::notify()->createFromArray([
                                                'type'  => Notification\Type::INTRO,
                                                'otype' => Notification\ObjectType::INTRO,
@@ -2754,6 +2742,13 @@ class Contact
                return null;
        }
 
+       /**
+        * Update the local relationship when a local user loses a follower
+        *
+        * @param array $contact User-specific contact (uid != 0) array
+        * @throws HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
        public static function removeFollower(array $contact)
        {
                if (in_array($contact['rel'] ?? [], [self::FRIEND, self::SHARING])) {
@@ -2763,6 +2758,10 @@ class Contact
                } else {
                        DI::logger()->info('Couldn\'t remove follower because of invalid contact array', ['contact' => $contact, 'callstack' => System::callstack()]);
                }
+
+               $cdata = Contact::getPublicAndUserContactID($contact['id'], $contact['uid']);
+
+               DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $cdata['public']]);
        }
 
        /**