From a193a482cd7ffc7ca9105f4131535d4fcf84e18f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 5 Nov 2015 00:42:38 +0100 Subject: [PATCH] Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts --- include/Scrape.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/Scrape.php b/include/Scrape.php index 0169f55fd..ae9331ff7 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']));