Merge pull request #7372 from nupplaphil/task/simplify_config

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index cfbfa683cff030005dddd3e4c1a207769210188f..82afc0769622959c068d320d293cd0f48808d3e2 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -87,6 +87,8 @@ class APContact extends BaseObject
                        return false;
                }
 
+               $fetched_contact = false;
+
                if (empty($update)) {
                        if (is_null($update)) {
                                $ref_update = DateTimeFormat::utc('now - 1 month');
@@ -110,24 +112,28 @@ class APContact extends BaseObject
                        if (!is_null($update)) {
                                return DBA::isResult($apcontact) ? $apcontact : false;
                        }
+
+                       if (DBA::isResult($apcontact)) {
+                               $fetched_contact = $apcontact;
+                       }
                }
 
                if (empty(parse_url($url, PHP_URL_SCHEME))) {
                        $url = self::addrToUrl($url);
                        if (empty($url)) {
-                               return false;
+                               return $fetched_contact;
                        }
                }
 
                $data = ActivityPub::fetchContent($url);
                if (empty($data)) {
-                       return false;
+                       return $fetched_contact;
                }
 
                $compacted = JsonLD::compact($data);
 
                if (empty($compacted['@id'])) {
-                       return false;
+                       return $fetched_contact;
                }
 
                $apcontact = [];
@@ -168,12 +174,12 @@ class APContact extends BaseObject
 
                // Quit if none of the basic values are set
                if (empty($apcontact['url']) || empty($apcontact['inbox']) || empty($apcontact['type'])) {
-                       return false;
+                       return $fetched_contact;
                }
 
                // Quit if this doesn't seem to be an account at all
                if (!in_array($apcontact['type'], ActivityPub::ACCOUNT_TYPES)) {
-                       return false;
+                       return $fetched_contact;
                }
 
                $parts = parse_url($apcontact['url']);
@@ -231,44 +237,6 @@ class APContact extends BaseObject
                        DBA::delete('apcontact', ['url' => $url]);
                }
 
-               // Update some data in the contact table with various ways to catch them all
-               $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']);
-               if (!empty($contact_types)) {
-                       $contact_type = array_pop($contact_types);
-                       if (is_int($contact_type)) {
-                               $contact_fields['contact-type'] = $contact_type;
-
-                               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'];
-                               }
-                       }
-               }
-
-               DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
-
-               if (!empty($apcontact['photo'])) {
-                       $contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);
-                       while ($contact = DBA::fetch($contacts)) {
-                               Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']);
-                       }
-                       DBA::close($contacts);
-               }
-
-               // Update the gcontact table
-               // These two fields don't exist in the gcontact table
-               unset($contact_fields['forum']);
-               unset($contact_fields['prv']);
-               DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
-
                Logger::log('Updated profile for ' . $url, Logger::DEBUG);
 
                return $apcontact;