jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael Vogel 2015-11-05 00:42:38 +01:00
parent 1075fa2c38
commit a193a482cd
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/Scrape.php
View file

@ -320,7 +320,7 @@ function scrape_feed($url) {
* PROBE_DIASPORA has a bias towards returning Diaspora information * PROBE_DIASPORA has a bias towards returning Diaspora information
* while PROBE_NORMAL has a bias towards dfrn/zot - in the case where * 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 * 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; $pubkey = $diaspora_key;
$diaspora = true; $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; $diaspora = false;
} }
} }
@ -779,6 +779,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
$baseurl = rtrim($baseurl, "/"); $baseurl = rtrim($baseurl, "/");
if(strpos($url,'@') AND ($addr == "") AND ($network == NETWORK_DFRN))
$addr = str_replace('acct:', '', $url);
$vcard['fn'] = notags($vcard['fn']); $vcard['fn'] = notags($vcard['fn']);
$vcard['nick'] = str_replace(' ','',notags($vcard['nick'])); $vcard['nick'] = str_replace(' ','',notags($vcard['nick']));