X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FPortableContact.php;h=f824be40f0e8065c796035d3976f7fbec041c982;hb=41b7d75cca9769203e66df5042846d260a1a0ed8;hp=f5513bddd61d472583f68939737272c75454fcc5;hpb=b5666bd27ffcc9b270ea7f1fffe1001a96d8d72b;p=friendica.git

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index f5513bddd6..f824be40f0 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -18,13 +18,13 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Protocol\Diaspora;
 use dba;
 use DOMDocument;
 use DOMXPath;
 use Exception;
 
 require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
 
 class PortableContact
 {
@@ -522,7 +522,12 @@ class PortableContact
 			}
 		}
 
-		$fields = ['updated' => $last_updated, 'last_contact' => DateTimeFormat::utcNow()];
+		$fields = ['last_contact' => DateTimeFormat::utcNow()];
+
+		if (!empty($last_updated)) {
+			$fields['updated'] = $last_updated;
+		}
+
 		dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
 		if (($gcontacts[0]["generation"] == 0)) {
@@ -946,6 +951,15 @@ class PortableContact
 			$register_policy = $gserver["register_policy"];
 			$registered_users = $gserver["registered-users"];
 
+			// See discussion under https://forum.friendi.ca/display/0b6b25a8135aabc37a5a0f5684081633
+			// It can happen that a zero date is in the database, but storing it again is forbidden.
+			if ($last_contact < NULL_DATE) {
+				$last_contact = NULL_DATE;
+			}
+			if ($last_failure < NULL_DATE) {
+				$last_failure = NULL_DATE;
+			}
+
 			if (!$force && !self::updateNeeded($gserver["created"], "", $last_failure, $last_contact)) {
 				logger("Use cached data for server ".$server_url, LOGGER_DEBUG);
 				return ($last_contact >= $last_failure);
@@ -1303,7 +1317,7 @@ class PortableContact
 				if (isset($data->version)) {
 					$network = NETWORK_DFRN;
 
-					$noscrape = $data->no_scrape_url;
+					$noscrape = defaults($data->no_scrape_url, '');
 					$version = $data->version;
 					$site_name = $data->site_name;
 					$info = $data->info;
@@ -1369,11 +1383,82 @@ class PortableContact
 			$fields['created'] = DateTimeFormat::utcNow();
 			dba::insert('gserver', $fields);
 		}
+
+		if (!$failure && in_array($fields['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
+			self::discoverRelay($server_url);
+		}
+
 		logger("End discovery for server " . $server_url, LOGGER_DEBUG);
 
 		return !$failure;
 	}
 
+	/**
+	 * @brief Fetch relay data from a given server url
+	 *
+	 * @param string $server_url address of the server
+	 */
+	private static function discoverRelay($server_url)
+	{
+		logger("Discover relay data for server " . $server_url, LOGGER_DEBUG);
+
+		$serverret = Network::curl($server_url."/.well-known/x-social-relay");
+		if (!$serverret["success"]) {
+			return;
+		}
+
+		$data = json_decode($serverret['body']);
+		if (!is_object($data)) {
+			return;
+		}
+
+		$gserver = dba::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => normalise_link($server_url)]);
+		if (!DBM::is_result($gserver)) {
+			return;
+		}
+
+		if (($gserver['relay-subscribe'] != $data->subscribe) || ($gserver['relay-scope'] != $data->scope)) {
+			$fields = ['relay-subscribe' => $data->subscribe, 'relay-scope' => $data->scope];
+			dba::update('gserver', $fields, ['id' => $gserver['id']]);
+		}
+
+		dba::delete('gserver-tag', ['gserver-id' => $gserver['id']]);
+		if ($data->scope == 'tags') {
+			// Avoid duplicates
+			$tags = [];
+			foreach ($data->tags as $tag) {
+				$tag = mb_strtolower($tag);
+				$tags[$tag] = $tag;
+			}
+
+			foreach ($tags as $tag) {
+				dba::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], true);
+			}
+		}
+
+		// Create or update the relay contact
+		$fields = [];
+		if (isset($data->protocols)) {
+			if (isset($data->protocols->diaspora)) {
+				$fields['network'] = NETWORK_DIASPORA;
+				if (isset($data->protocols->diaspora->receive)) {
+					$fields['batch'] = $data->protocols->diaspora->receive;
+				} elseif (is_string($data->protocols->diaspora)) {
+					$fields['batch'] = $data->protocols->diaspora;
+				}
+			}
+			if (isset($data->protocols->dfrn)) {
+				$fields['network'] = NETWORK_DFRN;
+				if (isset($data->protocols->dfrn->receive)) {
+					$fields['batch'] = $data->protocols->dfrn->receive;
+				} elseif (is_string($data->protocols->dfrn)) {
+					$fields['batch'] = $data->protocols->dfrn;
+				}
+			}
+		}
+		Diaspora::setRelayContact($server_url, $fields);
+	}
+
 	/**
 	 * @brief Returns a list of all known servers
 	 * @return array List of server urls
@@ -1455,8 +1540,8 @@ class PortableContact
 				$header = ['Authorization: Bearer '.$accesstoken];
 				$serverdata = Network::curl($api, false, $redirects, ['headers' => $header]);
 				if ($serverdata['success']) {
-				        $servers = json_decode($serverdata['body']);
-				        foreach ($servers->instances as $server) {
+					$servers = json_decode($serverdata['body']);
+					foreach ($servers->instances as $server) {
 						$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
 						Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $url);
 					}