X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=20ac8a36e86289b891da8606ed138df1deadf81e;hb=b5d2d32b443f7aa8ec6e0e91f36da3cc0a0f2a82;hp=e5a3f1e9b44c12fbb019f2bfff71be0a2ebac540;hpb=d6efc901946c91cf26a4436c4b58b1636e4bc9c9;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index e5a3f1e9b4..20ac8a36e8 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,28 +1,44 @@
.
+ *
*/
use Friendica\App;
use Friendica\Core\Protocol;
use Friendica\DI;
+use Friendica\Model\APContact;
use Friendica\Model\Contact;
-use Friendica\Network\Probe;
-use Friendica\Util\Network;
+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 = '
' . DI::l10n()->t('Subscribing to OStatus contacts') . '
';
+ $o = '' . DI::l10n()->t('Subscribing to contacts') . '
';
$uid = local_user();
- $counter = intval($_REQUEST['counter']);
+ $counter = intval($_REQUEST['counter'] ?? 0);
if (DI::pConfig()->get($uid, 'ostatus', 'legacy_friends') == '') {
@@ -31,24 +47,44 @@ function ostatus_subscribe_content(App $a)
return $o . DI::l10n()->t('No contact provided.');
}
- $contact = Probe::uri($_REQUEST['url']);
-
+ $contact = Contact::getByURL($_REQUEST['url']);
if (!$contact) {
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
return $o . DI::l10n()->t('Couldn\'t fetch information for contact.');
}
- $api = $contact['baseurl'] . '/api/';
-
- // Fetching friends
- $curlResult = Network::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'));
@@ -69,13 +105,13 @@ function ostatus_subscribe_content(App $a)
$friend = $friends[$counter++];
- $url = $friend->statusnet_profile_url;
+ $url = $friend->statusnet_profile_url ?? $friend;
$o .= '' . $counter . '/' . $total . ': ' . $url;
- $probed = Probe::uri($url);
- if ($probed['network'] == Protocol::OSTATUS) {
- $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
+ $probed = Contact::getByURL($url);
+ if (in_array($probed['network'], Protocol::FEDERATED)) {
+ $result = Contact::createFromProbeForUser($a->getLoggedInUserId(), $probed['url']);
if ($result['success']) {
$o .= ' - ' . DI::l10n()->t('success');
} else {