Merge remote-tracking branch 'upstream/develop' into share-rework

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index f4d5077c0ad7b4a379ebcdd014288066d9ed2806..5344ed84516e0ecbb79da81941d72d9c81d46542 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -24,24 +24,24 @@ use Friendica\Core\Protocol;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Protocol\ActivityPub;
 
-function ostatus_subscribe_content(App $a)
+function ostatus_subscribe_content(App $a): string
 {
-       if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.'));
+       if (!DI::userSession()->getLocalUserId()) {
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('ostatus_subscribe');
                // NOTREACHED
        }
 
        $o = '<h2>' . DI::l10n()->t('Subscribing to contacts') . '</h2>';
 
-       $uid = local_user();
+       $uid = DI::userSession()->getLocalUserId();
 
        $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 . DI::l10n()->t('No contact provided.');
@@ -57,7 +57,7 @@ function ostatus_subscribe_content(App $a)
                        $api = $contact['baseurl'] . '/api/';
 
                        // Fetching friends
-                       $curlResult = DI::httpClient()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
+                       $curlResult = DI::httpClient()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick'], HttpClientAccept::JSON);
 
                        if (!$curlResult->isSuccess()) {
                                DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');