Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 5f47313dc8d86f382c26ee633ec1f253b766f76e..97178f697ce81fa047518a6aea86fb155e8c8b3f 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)
        {
@@ -120,11 +123,14 @@ class APContact extends BaseObject
                $apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id');
                $apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id');
                $apcontact['inbox'] = JsonLD::fetchElement($compacted, 'ldp:inbox', '@id');
+               self::unarchiveInbox($apcontact['inbox'], false);
+
                $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');
+                       self::unarchiveInbox($apcontact['sharedinbox'], true);
                }
 
                $apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername');
@@ -137,7 +143,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 +163,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 +195,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 +204,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'];
                                }
                        }
                }
@@ -223,4 +234,27 @@ class APContact extends BaseObject
 
                return $apcontact;
        }
+
+       /**
+        * Unarchive inboxes
+        *
+        * @param string $url inbox url
+        */
+       private static function unarchiveInbox($url, $shared)
+       {
+               if (empty($url)) {
+                       return;
+               }
+
+               $now = DateTimeFormat::utcNow();
+
+               $fields = ['archive' => false, 'success' => $now, 'shared' => $shared];
+
+               if (!DBA::exists('inbox-status', ['url' => $url])) {
+                       $fields = array_merge($fields, ['url' => $url, 'created' => $now]);
+                       DBA::insert('inbox-status', $fields);
+               } else {
+                       DBA::update('inbox-status', $fields, ['url' => $url]);
+               }
+       }
 }