X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FAPContact.php;h=bf36306b4119901a4d5587dfa33605a2400f4fd6;hb=78271f0593ad0387a258d8c243646aaa5f36ee96;hp=ce66ec4c6e651e531b452f88df51923307ebf6fc;hpb=743e7d3ecb4bc06999284bffd977265abc23731f;p=friendica.git

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index ce66ec4c6e..bf36306b41 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -7,14 +7,14 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Network;
 use Friendica\Util\JsonLD;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Content\Text\HTML;
-
-require_once 'boot.php';
+use Friendica\Util\Strings;
 
 class APContact extends BaseObject
 {
@@ -23,6 +23,7 @@ class APContact extends BaseObject
 	 *
 	 * @param string $addr profile address (user@domain.tld)
 	 * @return string url
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function addrToUrl($addr)
 	{
@@ -33,12 +34,12 @@ class APContact extends BaseObject
 
 		$webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
 
-		$ret = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
-		if (!$ret['success'] || empty($ret['body'])) {
+		$curlResult = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
+		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return false;
 		}
 
-		$data = json_decode($ret['body'], true);
+		$data = json_decode($curlResult->getBody(), true);
 
 		if (empty($data['links'])) {
 			return false;
@@ -61,8 +62,10 @@ class APContact extends BaseObject
 	 * Fetches a profile from a given url
 	 *
 	 * @param string  $url    profile url
-	 * @param boolean $update true = always update, false = never update, null = update when not found
+	 * @param boolean $update true = always update, false = never update, null = update when not found or outdated
 	 * @return array profile array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function getByURL($url, $update = null)
 	{
@@ -71,18 +74,22 @@ class APContact extends BaseObject
 		}
 
 		if (empty($update)) {
+			if (is_null($update)) {
+				$ref_update = DateTimeFormat::utc('now - 1 month');
+			} else {
+				$ref_update = DBA::NULL_DATETIME;
+			}
+
 			$apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
+			if (!DBA::isResult($apcontact)) {
+				$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
 			}
 
-			$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
+			if (!DBA::isResult($apcontact)) {
+				$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
 			}
 
-			$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
-			if (DBA::isResult($apcontact)) {
+			if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update)) {
 				return $apcontact;
 			}
 
@@ -99,35 +106,63 @@ class APContact extends BaseObject
 		}
 
 		$data = ActivityPub::fetchContent($url);
+		if (empty($data)) {
+			return false;
+		}
+
+		$compacted = JsonLD::compact($data);
 
-		if (empty($data) || empty($data['id']) || empty($data['inbox'])) {
+		if (empty($compacted['@id'])) {
 			return false;
 		}
 
 		$apcontact = [];
-		$apcontact['url'] = $data['id'];
-		$apcontact['uuid'] = defaults($data, 'diaspora:guid', null);
-		$apcontact['type'] = defaults($data, 'type', null);
-		$apcontact['following'] = defaults($data, 'following', null);
-		$apcontact['followers'] = defaults($data, 'followers', null);
-		$apcontact['inbox'] = defaults($data, 'inbox', null);
-		$apcontact['outbox'] = defaults($data, 'outbox', null);
-		$apcontact['sharedinbox'] = JsonLD::fetchElement($data, 'endpoints', 'sharedInbox');
-		$apcontact['nick'] = defaults($data, 'preferredUsername', null);
-		$apcontact['name'] = defaults($data, 'name', $apcontact['nick']);
-		$apcontact['about'] = HTML::toBBCode(defaults($data, 'summary', ''));
-		$apcontact['photo'] = JsonLD::fetchElement($data, 'icon', 'url');
-		$apcontact['alias'] = JsonLD::fetchElement($data, 'url', 'href');
+		$apcontact['url'] = $compacted['@id'];
+		$apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid');
+		$apcontact['type'] = str_replace('as:', '', JsonLD::fetchElement($compacted, '@type'));
+		$apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id');
+		$apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id');
+		$apcontact['inbox'] = JsonLD::fetchElement($compacted, 'ldp:inbox', '@id');
+		$apcontact['outbox'] = JsonLD::fetchElement($compacted, 'as:outbox', '@id');
+
+		$apcontact['sharedinbox'] = '';
+		if (!empty($compacted['as:endpoints'])) {
+			$apcontact['sharedinbox'] = JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id');
+		}
+
+		$apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername');
+		$apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name');
+
+		if (empty($apcontact['name'])) {
+			$apcontact['name'] = $apcontact['nick'];
+		}
+
+		$apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary'));
+
+		$apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
+		if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
+			$apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
+		}
+
+		$apcontact['alias'] = JsonLD::fetchElement($compacted, 'as:url', '@id');
+		if (is_array($apcontact['alias'])) {
+			$apcontact['alias'] = JsonLD::fetchElement($compacted['as:url'], 'as:href', '@id');
+		}
+
+		if (empty($apcontact['url']) || empty($apcontact['inbox'])) {
+			return false;
+		}
 
 		$parts = parse_url($apcontact['url']);
 		unset($parts['scheme']);
 		unset($parts['path']);
 		$apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
 
-		$apcontact['pubkey'] = trim(JsonLD::fetchElement($data, 'publicKey', 'publicKeyPem'));
+		$apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem'));
+
+		$apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
 
 		// To-Do
-		// manuallyApprovesFollowers
 
 		// Unhandled
 		// @context, tag, attachment, image, nomadicLocations, signature, following, followers, featured, movedTo, liked
@@ -157,19 +192,42 @@ class APContact extends BaseObject
 		DBA::update('apcontact', $apcontact, ['url' => $url], true);
 
 		// Update some data in the contact table with various ways to catch them all
-		$contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about']];
-		DBA::update('contact', $contact_fields, ['nurl' => normalise_link($url)]);
+		$contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about'], 'alias' => $apcontact['alias']];
+
+		// Fetch the type and match it with the contact type
+		$contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
+		if (!empty($contact_types)) {
+			$contact_type = array_pop($contact_types);
+			if (is_int($contact_type)) {
+				$contact_fields['contact-type'] = $contact_type;
+
+				if ($contact_fields['contact-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
+					// Resetting the 'forum' and 'prv' field when it isn't a forum
+					$contact_fields['forum'] = false;
+					$contact_fields['prv'] = false;
+				} else {
+					// Otherwise set the corresponding forum type
+					$contact_fields['forum'] = !$apcontact['manually-approve'];
+					$contact_fields['prv'] = $apcontact['manually-approve'];
+				}
+			}
+		}
+
+		DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
 
-		$contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => normalise_link($url)]);
+		$contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);
 		while ($contact = DBA::fetch($contacts)) {
 			Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']);
 		}
 		DBA::close($contacts);
 
 		// Update the gcontact table
-		DBA::update('gcontact', $contact_fields, ['nurl' => normalise_link($url)]);
+		// These two fields don't exist in the gcontact table
+		unset($contact_fields['forum']);
+		unset($contact_fields['prv']);
+		DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
 
-		logger('Updated profile for ' . $url, LOGGER_DEBUG);
+		Logger::log('Updated profile for ' . $url, Logger::DEBUG);
 
 		return $apcontact;
 	}