X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FProtocol.php;h=bba7149a0462b848e4e3a6a101a2ec1f0256479a;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=a01e632bfacd73a94ffc3578c54e2756b3d694d4;hpb=2a442952b69987d578288891c064b0fed0369086;p=friendica.git diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php index a01e632bfa..bba7149a04 100644 --- a/src/Core/Protocol.php +++ b/src/Core/Protocol.php @@ -21,7 +21,9 @@ namespace Friendica\Core; +use Friendica\Database\DBA; use Friendica\DI; +use Friendica\Model\User; use Friendica\Network\HTTPException; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; @@ -84,10 +86,13 @@ class Protocol return true; } - $result = null; - Hook::callAll('support_follow', $result); + $hook_data = [ + 'protocol' => $protocol, + 'result' => null + ]; + Hook::callAll('support_follow', $hook_data); - return $result === true; + return $hook_data['result'] === true; } /** @@ -103,10 +108,13 @@ class Protocol return true; } - $result = null; - Hook::callAll('support_revoke_follow', $result); + $hook_data = [ + 'protocol' => $protocol, + 'result' => null + ]; + Hook::callAll('support_revoke_follow', $hook_data); - return $result === true; + return $hook_data['result'] === true; } /** @@ -202,16 +210,69 @@ class Protocol return $display_name . ' (' . self::getAddrFromProfileUrl($profile_url) . ')'; } + /** + * Send a follow message to a remote server. + * + * @param int $uid User Id + * @param array $contact Contact being followed + * @param ?string $protocol Expected protocol + * @return bool Only returns false in the unlikely case an ActivityPub contact ID doesn't exist (???) + * @throws HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function follow(int $uid, array $contact, ?string $protocol = null): bool + { + $owner = User::getOwnerDataById($uid); + if (!DBA::isResult($owner)) { + return true; + } + + $protocol = $protocol ?? $contact['protocol']; + + if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) { + // create a follow slap + $item = [ + 'verb' => Activity::FOLLOW, + 'gravity' => GRAVITY_ACTIVITY, + 'follow' => $contact['url'], + 'body' => '', + 'title' => '', + 'guid' => '', + 'uri-id' => 0, + ]; + + $slap = OStatus::salmon($item, $owner); + + if (!empty($contact['notify'])) { + Salmon::slapper($owner, $contact['notify'], $slap); + } + } elseif ($protocol == Protocol::DIASPORA) { + $contact = Diaspora::sendShare($owner, $contact); + Logger::notice('share returns: ' . $contact); + } elseif ($protocol == Protocol::ACTIVITYPUB) { + $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact['id']); + if (empty($activity_id)) { + // This really should never happen + return false; + } + + $success = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $owner['uid'], $activity_id); + Logger::notice('Follow returns: ' . $success); + } + + return true; + } + /** * Sends an unfriend message. Does not remove the contact * * @param array $user User unfriending * @param array $contact Contact unfriended - * @return bool|null true if successful, false if not, null if no action was performed + * @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 terminateFriendship(array $user, array $contact): ?bool { if (empty($contact['network'])) { throw new \InvalidArgumentException('Missing network key in contact array'); @@ -263,7 +324,7 @@ class Protocol * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function revokeFollow(array $contact) + public static function revokeFollow(array $contact): ?bool { if (empty($contact['network'])) { throw new \InvalidArgumentException('Missing network key in contact array');