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 c606e3107ed0a1ec387e43a8026f79bd0437d23c..97178f697ce81fa047518a6aea86fb155e8c8b3f 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -123,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');
@@ -192,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']);
@@ -201,7 +204,7 @@ 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;
@@ -231,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]);
+               }
+       }
 }