Merge branch 'develop' into task/mod_hostxrd

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 4ae6dbd1dc13537986a0faf5446b8678b0205500..47bbe7d59f137d21d1c17ad38ccd7a3d19823f41 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -89,12 +89,12 @@ class APContact extends BaseObject
                                $apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
                        }
 
-                       if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update)) {
+                       if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update) && !empty($apcontact['pubkey'])) {
                                return $apcontact;
                        }
 
                        if (!is_null($update)) {
-                               return false;
+                               return DBA::isResult($apcontact) ? $apcontact : false;
                        }
                }
 
@@ -118,29 +118,29 @@ class APContact extends BaseObject
 
                $apcontact = [];
                $apcontact['url'] = $compacted['@id'];
-               $apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid');
+               $apcontact['uuid'] = JsonLD::fetchElement($compacted, 'diaspora:guid', '@value');
                $apcontact['type'] = str_replace('as:', '', JsonLD::fetchElement($compacted, '@type'));
                $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']);
+               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']);
+                       self::unarchiveInbox($apcontact['sharedinbox'], true);
                }
 
-               $apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername');
-               $apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name');
+               $apcontact['nick'] = JsonLD::fetchElement($compacted, 'as:preferredUsername', '@value');
+               $apcontact['name'] = JsonLD::fetchElement($compacted, 'as:name', '@value');
 
                if (empty($apcontact['name'])) {
                        $apcontact['name'] = $apcontact['nick'];
                }
 
-               $apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary'));
+               $apcontact['about'] = HTML::toBBCode(JsonLD::fetchElement($compacted, 'as:summary', '@value'));
 
                $apcontact['photo'] = JsonLD::fetchElement($compacted, 'as:icon', '@id');
                if (is_array($apcontact['photo']) || !empty($compacted['as:icon']['as:url']['@id'])) {
@@ -161,7 +161,9 @@ class APContact extends BaseObject
                unset($parts['path']);
                $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
 
-               $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted, 'w3id:publicKey', 'w3id:publicKeyPem'));
+               if (!empty($compacted['w3id:publicKey'])) {
+                       $apcontact['pubkey'] = trim(JsonLD::fetchElement($compacted['w3id:publicKey'], 'w3id:publicKeyPem', '@value'));
+               }
 
                $apcontact['manually-approve'] = (int)JsonLD::fetchElement($compacted, 'as:manuallyApprovesFollowers');
 
@@ -240,7 +242,7 @@ class APContact extends BaseObject
         *
         * @param string $url inbox url
         */
-       private static function unarchiveInbox($url)
+       private static function unarchiveInbox($url, $shared)
        {
                if (empty($url)) {
                        return;
@@ -248,12 +250,12 @@ class APContact extends BaseObject
 
                $now = DateTimeFormat::utcNow();
 
+               $fields = ['archive' => false, 'success' => $now, 'shared' => $shared];
+
                if (!DBA::exists('inbox-status', ['url' => $url])) {
-                       $fields = ['archive' => false, 'success' => $now,
-                               'url' => $url, 'created' => $now];
+                       $fields = array_merge($fields, ['url' => $url, 'created' => $now]);
                        DBA::insert('inbox-status', $fields);
                } else {
-                       $fields = ['archive' => false, 'success' => $now];
                        DBA::update('inbox-status', $fields, ['url' => $url]);
                }
        }