X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=f4d5077c0ad7b4a379ebcdd014288066d9ed2806;hb=1d5206d594a76297f36ecbaa85ac1ef46ba57c1d;hp=5a3a625cec481167a72ddee9d011763b3c7f5efe;hpb=2973ed6448f56dd807df3ec0d20d095226d14b65;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 5a3a625cec..f4d5077c0a 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,21 +22,23 @@
 use Friendica\App;
 use Friendica\Core\Protocol;
 use Friendica\DI;
+use Friendica\Model\APContact;
 use Friendica\Model\Contact;
+use Friendica\Protocol\ActivityPub;
 
 function ostatus_subscribe_content(App $a)
 {
 	if (!local_user()) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		DI::baseUrl()->redirect('ostatus_subscribe');
 		// NOTREACHED
 	}
 
-	$o = '<h2>' . DI::l10n()->t('Subscribing to OStatus contacts') . '</h2>';
+	$o = '<h2>' . DI::l10n()->t('Subscribing to contacts') . '</h2>';
 
 	$uid = local_user();
 
-	$counter = intval($_REQUEST['counter']);
+	$counter = intval($_REQUEST['counter'] ?? 0);
 
 	if (DI::pConfig()->get($uid, 'ostatus', 'legacy_friends') == '') {
 
@@ -51,17 +53,38 @@ function ostatus_subscribe_content(App $a)
 			return $o . DI::l10n()->t('Couldn\'t fetch information for contact.');
 		}
 
-		$api = $contact['baseurl'] . '/api/';
-
-		// Fetching friends
-		$curlResult = DI::httpRequest()->curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
-
-		if (!$curlResult->isSuccess()) {
+		if ($contact['network'] == Protocol::OSTATUS) {
+			$api = $contact['baseurl'] . '/api/';
+
+			// Fetching friends
+			$curlResult = DI::httpClient()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
+
+			if (!$curlResult->isSuccess()) {
+				DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+				return $o . DI::l10n()->t('Couldn\'t fetch friends for contact.');
+			}
+
+			$friends = $curlResult->getBody();
+			if (empty($friends)) {
+				DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+				return $o . DI::l10n()->t('Couldn\'t fetch following contacts.');
+			}
+			DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', $friends);
+		} elseif ($apcontact = APContact::getByURL($contact['url'])) {
+			if (empty($apcontact['following'])) {
+				DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+				return $o . DI::l10n()->t('Couldn\'t fetch remote profile.');
+			}
+			$followings = ActivityPub::fetchItems($apcontact['following']);
+			if (empty($followings)) {
+				DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+				return $o . DI::l10n()->t('Couldn\'t fetch following contacts.');
+			}
+			DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', json_encode($followings));
+		} else {
 			DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
-			return $o . DI::l10n()->t('Couldn\'t fetch friends for contact.');
+			return $o . DI::l10n()->t('Unsupported network');
 		}
-
-		DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
 	}
 
 	$friends = json_decode(DI::pConfig()->get($uid, 'ostatus', 'legacy_friends'));
@@ -82,13 +105,13 @@ function ostatus_subscribe_content(App $a)
 
 	$friend = $friends[$counter++];
 
-	$url = $friend->statusnet_profile_url;
+	$url = $friend->statusnet_profile_url ?? $friend;
 
 	$o .= '<p>' . $counter . '/' . $total . ': ' . $url;
 
 	$probed = Contact::getByURL($url);
-	if ($probed['network'] == Protocol::OSTATUS) {
-		$result = Contact::createFromProbe($a->user, $probed['url'], true, Protocol::OSTATUS);
+	if (in_array($probed['network'], Protocol::FEDERATED)) {
+		$result = Contact::createFromProbeForUser($a->getLoggedInUserId(), $probed['url']);
 		if ($result['success']) {
 			$o .= ' - ' . DI::l10n()->t('success');
 		} else {