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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 5f47313dc8..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)
 	{
@@ -63,6 +64,8 @@ class APContact extends BaseObject
 	 * @param string  $url    profile url
 	 * @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)
 	{
@@ -137,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');
 		}
 
@@ -157,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
@@ -188,7 +192,7 @@ 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']);
@@ -197,10 +201,14 @@ class APContact extends BaseObject
 			if (is_int($contact_type)) {
 				$contact_fields['contact-type'] = $contact_type;
 
-				// Resetting the 'forum' and 'prv' field when it isn't a forum
-				if ($contact_fields['contact-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
+				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'];
 				}
 			}
 		}