From: Michael Vogel <icarus@dabo.de>
Date: Wed, 4 Nov 2015 23:42:38 +0000 (+0100)
Subject: Friendica contacts where detected as OStatus contacts when they should be Diaspora... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a193a482cd7ffc7ca9105f4131535d4fcf84e18f;p=friendica.git

Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts
---

diff --git a/include/Scrape.php b/include/Scrape.php
index 0169f55fd5..ae9331ff7a 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -320,7 +320,7 @@ function scrape_feed($url) {
  * PROBE_DIASPORA has a bias towards returning Diaspora information
  * while PROBE_NORMAL has a bias towards dfrn/zot - in the case where
  * an address (such as a Friendica address) supports more than one type
- * of network. 
+ * of network.
  *
  */
 
@@ -407,7 +407,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 						$pubkey = $diaspora_key;
 					$diaspora = true;
 				}
-				if($link['@attributes']['rel'] === 'http://ostatus.org/schema/1.0/subscribe') {
+				if(($link['@attributes']['rel'] === 'http://ostatus.org/schema/1.0/subscribe') AND ($mode == PROBE_NORMAL)) {
 					$diaspora = false;
 				}
 			}
@@ -779,6 +779,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 
 	$baseurl = rtrim($baseurl, "/");
 
+	if(strpos($url,'@') AND ($addr == "") AND ($network == NETWORK_DFRN))
+		$addr = str_replace('acct:', '', $url);
+
 	$vcard['fn'] = notags($vcard['fn']);
 	$vcard['nick'] = str_replace(' ','',notags($vcard['nick']));