X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=20ac8a36e86289b891da8606ed138df1deadf81e;hb=6b7babd58f5ece97969e81d2ad21df1a60725bef;hp=f6d826e85a5b406cd785008018e326996ec8110a;hpb=c58dc357d4fb97fc7d22e5c2db03a4f22719185c;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index f6d826e85a..20ac8a36e8 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,55 +1,90 @@
.
+ *
*/
use Friendica\App;
-use Friendica\Core\L10n;
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(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
DI::baseUrl()->redirect('ostatus_subscribe');
// NOTREACHED
}
- $o = '
' . 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') == '') {
if ($_REQUEST['url'] == '') {
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
- return $o . L10n::t('No contact provided.');
+ 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 . L10n::t('Couldn\'t fetch information for 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 . 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'));
@@ -64,31 +99,31 @@ function ostatus_subscribe_content(App $a)
DI::page()['htmlhead'] = '';
DI::pConfig()->delete($uid, 'ostatus', 'legacy_friends');
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
- $o .= L10n::t('Done');
+ $o .= DI::l10n()->t('Done');
return $o;
}
$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 .= ' - ' . L10n::t('success');
+ $o .= ' - ' . DI::l10n()->t('success');
} else {
- $o .= ' - ' . L10n::t('failed');
+ $o .= ' - ' . DI::l10n()->t('failed');
}
} else {
- $o .= ' - ' . L10n::t('ignored');
+ $o .= ' - ' . DI::l10n()->t('ignored');
}
$o .= '
';
- $o .= '' . L10n::t('Keep this window open until done.') . '
';
+ $o .= '' . DI::l10n()->t('Keep this window open until done.') . '
';
DI::page()['htmlhead'] = '';