Fix worker priorities

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

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index bba7149a0462b848e4e3a6a101a2ec1f0256479a..c141bbc54e6240f2c79372050468e458ab34964c 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,6 @@
 namespace Friendica\Core;
 
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
@@ -117,99 +116,6 @@ class Protocol
                return $hook_data['result'] === true;
        }
 
-       /**
-        * Returns the address string for the provided profile URL
-        *
-        * @param string $profile_url
-        * @return string
-        * @throws \Exception
-        */
-       public static function getAddrFromProfileUrl($profile_url)
-       {
-               $network = self::matchByProfileUrl($profile_url, $matches);
-
-               if ($network === self::PHANTOM) {
-                       return "";
-               }
-
-               $addr = $matches[2] . '@' . $matches[1];
-
-               return $addr;
-       }
-
-       /**
-        * Guesses the network from a profile URL
-        *
-        * @param string $profile_url
-        * @param array  $matches preg_match return array: [0] => Full match [1] => hostname [2] => username
-        * @return string
-        */
-       public static function matchByProfileUrl($profile_url, &$matches = [])
-       {
-               if (preg_match('=https?://(twitter\.com)/(.*)=ism', $profile_url, $matches)) {
-                       return self::TWITTER;
-               }
-
-               if (preg_match('=https?://(alpha\.app\.net)/(.*)=ism', $profile_url, $matches)) {
-                       return self::APPNET;
-               }
-
-               if (preg_match('=https?://(plus\.google\.com)/(.*)=ism', $profile_url, $matches)) {
-                       return self::GPLUS;
-               }
-
-               if (preg_match('=https?://(.*)/profile/(.*)=ism', $profile_url, $matches)) {
-                       return self::DFRN;
-               }
-
-               if (preg_match('=https?://(.*)/u/(.*)=ism', $profile_url, $matches)) {
-                       return self::DIASPORA;
-               }
-
-               if (preg_match('=https?://(.*)/channel/(.*)=ism', $profile_url, $matches)) {
-                       // RedMatrix/Hubzilla is identified as Diaspora - friendica can't connect directly to it
-                       return self::DIASPORA;
-               }
-
-               if (preg_match('=https?://(.*)/user/(.*)=ism', $profile_url, $matches)) {
-                       $statusnet_host = $matches[1];
-                       $statusnet_user = $matches[2];
-                       $UserData = DI::httpClient()->fetch('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);
-                       $user = json_decode($UserData);
-                       if ($user) {
-                               $matches[2] = $user->screen_name;
-                               return self::STATUSNET;
-                       }
-               }
-
-               // Mastodon, Pleroma
-               if (preg_match('=https?://(.+?)/users/(.+)=ism', $profile_url, $matches)
-                       || preg_match('=https?://(.+?)/@(.+)=ism', $profile_url, $matches)
-               ) {
-                       return self::ACTIVITYPUB;
-               }
-
-               // pumpio (http://host.name/user)
-               if (preg_match('=https?://([\.\w]+)/([\.\w]+)$=ism', $profile_url, $matches)) {
-                       return self::PUMPIO;
-               }
-
-               return self::PHANTOM;
-       }
-
-       /**
-        * Returns a formatted mention from a profile URL and a display name
-        *
-        * @param string $profile_url
-        * @param string $display_name
-        * @return string
-        * @throws \Exception
-        */
-       public static function formatMention($profile_url, $display_name)
-       {
-               return $display_name . ' (' . self::getAddrFromProfileUrl($profile_url) . ')';
-       }
-
        /**
         * Send a follow message to a remote server.
         *
@@ -264,15 +170,15 @@ 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');
@@ -309,7 +215,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);
 
@@ -319,12 +226,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');
@@ -336,13 +244,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);