follow activitypub by webfinger; requires addon update to all federation protocols

2 files changed, 9 insertions, 8 deletions

diff --git a/include/follow.php b/include/follow.php
index a63fe66ea..d803afa3f 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -150,9 +150,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 
 			// attempt network auto-discovery
 
-			$d = discover_by_webbie($url,$protocol);
+			$wf = discover_by_webbie($url,$protocol);
 
-			if((! $d) && ($is_http)) {
+			if((! $wf) && ($is_http)) {
 
 				// try RSS discovery
 
@@ -167,9 +167,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 				}
 			}
 
-			if($d) {
+			if($wf || $d) {
 				$r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1",
-					dbesc($url),
+					dbesc(($wf) ? $wf : $url),
 					dbesc($url)
 				);
 			}
diff --git a/include/network.php b/include/network.php
index 897fbccd6..c41d87af0 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1192,9 +1192,10 @@ function discover_by_webbie($webbie, $protocol = '') {
 	logger('webfinger: ' . print_r($x,true), LOGGER_DATA, LOG_INFO);
 
 	$arr = [
-			'address' => $webbie,
-			'protocol' => $protocol,
-			'success' => false,
+			'address'   => $webbie,
+			'protocol'  => $protocol,
+			'success'   => false,
+			'xchan'     => '',
 			'webfinger' => $x
 	];
 	/**
@@ -1207,7 +1208,7 @@ function discover_by_webbie($webbie, $protocol = '') {
 	 */
 	call_hooks('discover_channel_webfinger', $arr);
 	if($arr['success'])
-		return true;
+		return $arr['xchan'];
 
 	return false;
 }