X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=3f716c8c7bb670d3f1197d7414e8f363c3195a80;hb=bbdb0de2ad26c03b43da223d66f6f6121acc943e;hp=64774eead9fc5a4ede2f612baa200457667018be;hpb=77e0d8c7bcb698b8c8f5f5acfa01088d2395d216;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 64774eead9..3f716c8c7b 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -23,13 +23,11 @@ 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
 	}
@@ -47,7 +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.');
@@ -56,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');
@@ -88,7 +86,7 @@ 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($a->user, $probed['url'], true, Protocol::OSTATUS);
 		if ($result['success']) {