Merge pull request #12375 from annando/issue-12373

Issue 12373: Fix communication to Diaspora

src/Model/Contact.php

@@ -1396,6 +1396,8 @@ class Contact
 
 		if ($data['network'] == Protocol::DIASPORA) {
 			DI::dsprContact()->updateFromProbeArray($data);
+		} elseif (!empty($data['networks'][Protocol::DIASPORA])) {
+			DI::dsprContact()->updateFromProbeArray($data['networks'][Protocol::DIASPORA]);
 		}
 
 		self::updateFromProbeArray($contact_id, $data);
@@ -2487,6 +2489,8 @@ class Contact
 
 		if ($ret['network'] == Protocol::DIASPORA) {
 			DI::dsprContact()->updateFromProbeArray($ret);
+		} elseif (!empty($ret['networks'][Protocol::DIASPORA])) {
+			DI::dsprContact()->updateFromProbeArray($ret['networks'][Protocol::DIASPORA]);
 		}
 
 		return self::updateFromProbeArray($id, $ret);

src/Network/Probe.php

@@ -134,6 +134,17 @@ class Probe
 			}
 		}
 
+		$newdata['networks'] = [];
+		foreach ([Protocol::DIASPORA, Protocol::OSTATUS] as $network) {
+			if (!empty($data['networks'][$network])) {
+				$data['networks'][$network]['subscribe'] = $newdata['subscribe'] ?? '';
+				$data['networks'][$network]['baseurl'] = $newdata['baseurl'] ?? '';
+				$data['networks'][$network]['gsid'] = $newdata['gsid'] ?? 0;
+				$newdata['networks'][$network] = self::rearrangeData($data['networks'][$network]);
+				unset($newdata['networks'][$network]['networks']);
+			}
+		}
+
 		// We don't use the "priority" field anymore and replace it with a dummy.
 		$newdata['priority'] = 0;
 
@@ -345,7 +356,11 @@ class Probe
 				$data = [];
 			}
 			if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') != Protocol::DFRN))) {
+				$networks = $data['networks'] ?? [];
+				unset($data['networks']);
+				$networks[$data['network']] = $data;
 				$data = $ap_profile;
+				$data['networks'] = $networks;
 			} elseif (!empty($ap_profile)) {
 				$ap_profile['batch'] = '';
 				$data = array_merge($ap_profile, $data);
@@ -716,9 +731,13 @@ class Probe
 		}
 		if ((!$result && ($network == '')) || ($network == Protocol::DIASPORA)) {
 			$result = self::diaspora($webfinger);
+		} else {
+			$result['networks'][Protocol::DIASPORA] = self::diaspora($webfinger);
 		}
 		if ((!$result && ($network == '')) || ($network == Protocol::OSTATUS)) {
 			$result = self::ostatus($webfinger);
+		} else {
+			$result['networks'][Protocol::OSTATUS] = self::ostatus($webfinger);
 		}
 		if (in_array($network, ['', Protocol::ZOT])) {
 			$result = self::zot($webfinger, $result, $baseurl);

src/Protocol/Diaspora.php

@@ -826,9 +826,15 @@ class Diaspora
 	 */
 	public static function isSupportedByContactUrl(string $url, ?bool $update = null): bool
 	{
-		$contact = Contact::getByURL($url, $update);
+		$contact = Contact::getByURL($url, $update, ['uri-id', 'network']);
 
-		return DI::dsprContact()->existsByUriId($contact['uri-id'] ?? 0);
+		$supported = DI::dsprContact()->existsByUriId($contact['uri-id'] ?? 0);
+
+		if (!$supported && is_null($update) && ($contact['network'] == Protocol::DFRN)) {
+			$supported = self::isSupportedByContactUrl($url, true);
+		}
+
+		return $supported;
 	}
 
 	/**
@@ -4064,7 +4070,7 @@ class Diaspora
 			return false;
 		}
 
-		if (!self::isSupportedByContactUrl($parent_post['author-link'], false)) {
+		if (!self::isSupportedByContactUrl($parent_post['author-link'])) {
 			Logger::info('Parent author is no Diaspora contact.', ['parent-id' => $parent_id]);
 			return false;
 		}

src/Worker/Delivery.php

@@ -277,7 +277,7 @@ class Delivery
 	private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol = null)
 	{
 		// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
-		if (Diaspora::getReshareDetails($target_item ?? []) && Diaspora::isSupportedByContactUrl($contact['addr'], false)) {
+		if (Diaspora::getReshareDetails($target_item ?? []) && Diaspora::isSupportedByContactUrl($contact['addr'])) {
 			Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
 			self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 			return;