Use toConfigValue in case of serialized, legacy data

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

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 511954c7f93a14fd0685e08cb5373b14a947fba2..5ca366e345fa59818daf94d46b6f32b364abcbef 100644 (file)
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -52,7 +52,6 @@ class Protocol
 
        // Supported through a connector
        const DIASPORA2 = 'dspc';    // Diaspora connector
-       const LINKEDIN  = 'lnkd';    // LinkedIn
        const PUMPIO    = 'pump';    // pump.io
        const STATUSNET = 'stac';    // Statusnet connector
        const TWITTER   = 'twit';    // Twitter
@@ -66,6 +65,7 @@ class Protocol
        // Currently unsupported
        const ICALENDAR = 'ical';    // iCalendar
        const MYSPACE   = 'mysp';    // MySpace
+       const LINKEDIN  = 'lnkd';    // LinkedIn
        const NEWS      = 'nntp';    // Network News Transfer Protocol
        const PNUT      = 'pnut';    // pnut.io
        const XMPP      = 'xmpp';    // XMPP
@@ -174,16 +174,16 @@ class Protocol
         * Sends an unfollow message. Does not remove the contact
         *
         * @param array $contact Target public contact (uid = 0) array
-        * @param array $user    Source local user array
+        * @param array $owner   Source owner-view record
         * @return bool|null true if successful, false if not, null if no remote action was performed
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function unfollow(array $contact, array $user): ?bool
+       public static function unfollow(array $contact, array $owner): ?bool
        {
                if (empty($contact['network'])) {
                        Logger::notice('Contact has got no network, we quit here', ['id' => $contact['id']]);
-                       return true;
+                       return null;
                }
 
                $protocol = $contact['network'];
@@ -203,24 +203,24 @@ class Protocol
                                'uri-id'  => 0,
                        ];
 
-                       $slap = OStatus::salmon($item, $user);
+                       $slap = OStatus::salmon($item, $owner);
 
                        if (empty($contact['notify'])) {
                                Logger::notice('OStatus/DFRN Contact is missing notify, we quit here', ['id' => $contact['id']]);
-                               return true;
+                               return null;
                        }
 
-                       return Salmon::slapper($user, $contact['notify'], $slap) === 0;
+                       return Salmon::slapper($owner, $contact['notify'], $slap) === 0;
                } elseif ($protocol == Protocol::DIASPORA) {
-                       return Diaspora::sendUnshare($user, $contact) > 0;
+                       return Diaspora::sendUnshare($owner, $contact) > 0;
                } elseif ($protocol == Protocol::ACTIVITYPUB) {
-                       return ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
+                       return ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $owner);
                }
 
                // Catch-all hook for connector addons
                $hook_data = [
                        'contact' => $contact,
-                       'uid'     => $user['uid'],
+                       'uid'     => $owner['uid'],
                        'result'  => null,
                ];
                Hook::callAll('unfollow', $hook_data);
@@ -232,12 +232,12 @@ class Protocol
         * Revoke an incoming follow from the provided contact
         *
         * @param array $contact Target public contact (uid == 0) array
-        * @param int   $uid     Source local user id
+        * @param array $owner   Source owner-view record
         * @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, int $uid): ?bool
+       public static function revokeFollow(array $contact, array $owner): ?bool
        {
                if (empty($contact['network'])) {
                        throw new \InvalidArgumentException('Missing network key in contact array');
@@ -249,13 +249,13 @@ class Protocol
                }
 
                if ($protocol == Protocol::ACTIVITYPUB) {
-                       return ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $uid);
+                       return ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $owner);
                }
 
                // Catch-all hook for connector addons
                $hook_data = [
                        'contact' => $contact,
-                       'uid'     => $uid,
+                       'uid'     => $owner['uid'],
                        'result'  => null,
                ];
                Hook::callAll('revoke_follow', $hook_data);