More test data

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index e5a3f1e9b44c12fbb019f2bfff71be0a2ebac540..3f716c8c7bb670d3f1197d7414e8f363c3195a80 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,19 +1,33 @@
 <?php
 /**
- * @file mod/ostatus_subscribe.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Core\Protocol;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Network\Probe;
-use Friendica\Util\Network;
 
 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
        }
@@ -31,8 +45,7 @@ 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.');
@@ -41,7 +54,7 @@ function ostatus_subscribe_content(App $a)
                $api = $contact['baseurl'] . '/api/';
 
                // Fetching friends
-               $curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
+               $curlResult = DI::httpRequest()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
 
                if (!$curlResult->isSuccess()) {
                        DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
@@ -73,9 +86,9 @@ function ostatus_subscribe_content(App $a)
 
        $o .= '<p>' . $counter . '/' . $total . ': ' . $url;
 
-       $probed = Probe::uri($url);
+       $probed = Contact::getByURL($url);
        if ($probed['network'] == Protocol::OSTATUS) {
-               $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
+               $result = Contact::createFromProbe($a->user, $probed['url'], true, Protocol::OSTATUS);
                if ($result['success']) {
                        $o .= ' - ' . DI::l10n()->t('success');
                } else {