X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=713d6f114601d901b53036b7a46ade4b83805a0e;hb=1342825401e6e9e079eeec212271046930e1f475;hp=009816d8186c7f82f1b71a4b007de7f99fa39f5c;hpb=335cd76baf1cf4352e56f779c898118eb9f36ff1;p=friendica.git

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 009816d818..713d6f1146 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -27,11 +27,12 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\Register;
 use Friendica\Network\CurlResult;
-use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -518,7 +519,7 @@ class GServer
 			$data['tags'] = [];
 		}
 
-		$gserver = DBA::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
+		$gserver = DBA::selectFirst('gserver', ['id', 'url', 'network', 'relay-subscribe', 'relay-scope'], ['nurl' => Strings::normaliseLink($server_url)]);
 		if (!DBA::isResult($gserver)) {
 			return;
 		}
@@ -541,7 +542,7 @@ class GServer
 			}
 
 			foreach ($tags as $tag) {
-				DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], true);
+				DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], Database::INSERT_IGNORE);
 			}
 		}
 
@@ -567,8 +568,22 @@ class GServer
 					$fields['batch'] = $data['protocols']['dfrn'];
 				}
 			}
+
+			if (isset($data['protocols']['activitypub'])) {
+				$fields['network'] = Protocol::ACTIVITYPUB;
+
+				if (!empty($data['protocols']['activitypub']['actor'])) {
+					$fields['url'] = $data['protocols']['activitypub']['actor'];
+				}
+				if (!empty($data['protocols']['activitypub']['receive'])) {
+					$fields['batch'] = $data['protocols']['activitypub']['receive'];
+				}
+			}
 		}
-		Diaspora::setRelayContact($server_url, $fields);
+
+		Logger::info('Discovery ended', ['server' => $server_url, 'data' => $fields]);
+
+		Relay::updateContact($gserver, $fields);
 	}
 
 	/**
@@ -1639,7 +1654,7 @@ class GServer
 		if (!empty($accesstoken)) {
 			$api = 'https://instances.social/api/1.0/instances/list?count=0';
 			$header = ['Authorization: Bearer '.$accesstoken];
-			$curlResult = DI::httpRequest()->get($api, ['headers' => $header]);
+			$curlResult = DI::httpRequest()->get($api, ['header' => $header]);
 
 			if ($curlResult->isSuccess()) {
 				$servers = json_decode($curlResult->getBody(), true);