X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FProtocol.php;h=e4490da73265342405cd27f049a479e71439b33b;hb=ca0e3e3db72c4120a194c3e213690b597cbb95e9;hp=3b3a29d071d24cfbef83b2b2cb2c0e34c5aaa5ed;hpb=3d08f54966c8af8e4e3a47c98592572c5ae3333d;p=friendica.git diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php index 3b3a29d071..e4490da732 100644 --- a/src/Core/Protocol.php +++ b/src/Core/Protocol.php @@ -1,6 +1,6 @@ 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 (!empty($user->screen_name)) { - $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. * @@ -233,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' => '', @@ -264,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 null; } $protocol = $contact['network']; @@ -285,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 null; } return Salmon::slapper($user, $contact['notify'], $slap) === 0; @@ -309,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); @@ -319,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'); @@ -336,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);