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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index bbaf6dad62..bf36306b41 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -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)
 	{
@@ -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;
 			}
 
@@ -133,7 +140,7 @@ class APContact extends BaseObject
 		$apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary'));
 
 		$apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
-		if (is_array($apcontact['photo'])) {
+		if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
 			$apcontact['photo'] = JsonLD::fetchElement($compacted['as:icon'], 'as:url', '@id');
 		}
 
@@ -153,8 +160,9 @@ class APContact extends BaseObject
 
 		$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
@@ -184,7 +192,27 @@ 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']];
+		$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' => Strings::normaliseLink($url)]);
@@ -194,6 +222,9 @@ class APContact extends BaseObject
 		DBA::close($contacts);
 
 		// Update the gcontact table
+		// 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::log('Updated profile for ' . $url, Logger::DEBUG);