Merge pull request #6725 from nupplaphil/6691-rendertime-fix

[friendica.git] / src / Model / APContact.php

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 2b5a5c4e7b15015636170933b764d82e31071b75..bf36306b4119901a4d5587dfa33605a2400f4fd6 100644 (file)
--- 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,7 +160,7 @@ class APContact extends BaseObject
 
                $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem'));
 
-               $manually_approve = JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
+               $apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
 
                // To-Do
 
@@ -189,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']);
@@ -198,14 +201,14 @@ class APContact extends BaseObject
                        if (is_int($contact_type)) {
                                $contact_fields['contact-type'] = $contact_type;
 
-                               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'] = !$manually_approve;
-                                       $contact_fields['prv'] = $manually_approve;
+                                       $contact_fields['forum'] = !$apcontact['manually-approve'];
+                                       $contact_fields['prv'] = $apcontact['manually-approve'];
                                }
                        }
                }