From c2f6b166c7302d39e6e754119679036a4fca7473 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Sep 2018 21:57:41 +0000
Subject: [PATCH] We now use the regular probing function

---
 src/Network/Probe.php        | 12 +++++++++++-
 src/Protocol/ActivityPub.php | 13 ++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index af2d1c9a1..99ecb668c 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -328,7 +329,16 @@ class Probe
 			$uid = local_user();
 		}
 
-		$data = self::detect($uri, $network, $uid);
+		if ($network != Protocol::ACTIVITYPUB) {
+			$data = self::detect($uri, $network, $uid);
+		}
+
+		if (empty($data) || ($data['network'] == Protocol::PHANTOM)) {
+			$ap_profile = ActivityPub::fetchProfile($uri);
+			if (!empty($ap_profile) && ($ap_profile['network'] == Protocol::ACTIVITYPUB)) {
+				$data = $ap_profile;
+			}
+		}
 
 		if (!isset($data["url"])) {
 			$data["url"] = $uri;
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 83aae72aa..12c849d5b 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -15,6 +15,7 @@ use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Crypto;
 use Friendica\Content\Text\BBCode;
+use Friendica\Network\Probe;
 
 /**
  * @brief ActivityPub Protocol class
@@ -322,11 +323,11 @@ class ActivityPub
 	{
 		$url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id);
 
-		$profile = self::fetchProfile($url);
+		$profile = Probe::uri($url, Protocol::ACTIVITYPUB);
 		if (!empty($profile)) {
 			return $profile['pubkey'];
 		} elseif ($url != $actor) {
-			$profile = self::fetchProfile($actor);
+			$profile = Probe::uri($actor, Protocol::ACTIVITYPUB);
 			if (!empty($profile)) {
 				return $profile['pubkey'];
 			}
@@ -395,19 +396,21 @@ class ActivityPub
 		$profile['name'] = defaults($data, 'name', $profile['nick']);
 		$profile['guid'] = defaults($data, 'uuid', null);
 		$profile['url'] = $data['id'];
-		$profile['alias'] = self::processElement($data, 'url', 'href');
 
 		$parts = parse_url($profile['url']);
 		unset($parts['scheme']);
 		unset($parts['path']);
 		$profile['addr'] = $profile['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
-
+		$profile['alias'] = self::processElement($data, 'url', 'href');
 		$profile['photo'] = self::processElement($data, 'icon', 'url');
+		// $profile['community']
+		// $profile['keywords']
+		// $profile['location']
 		$profile['about'] = defaults($data, 'summary', '');
 		$profile['batch'] = self::processElement($data, 'endpoints', 'sharedInbox');
-		$profile['pubkey'] = self::processElement($data, 'publicKey', 'publicKeyPem');
 		$profile['notify'] = $data['inbox'];
 		$profile['poll'] = $data['outbox'];
+		$profile['pubkey'] = self::processElement($data, 'publicKey', 'publicKeyPem');
 
 		// Check if the address is resolvable
 		if (self::addrToUrl($profile['addr']) == $profile['url']) {