Issue 9968: Avoid blocking update calls

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index f96c556d241784ce4e86279b7c6517efa0f2c4cc..e4cc88240e1e07acafa9cb17449f4d2e0219e045 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -855,7 +855,9 @@ class Contact
                if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) {
                        $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
                        $condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
-                       DBA::update('contact', $fields, $condition);
+                       if (!DBA::exists('contact', array_merge($condition, $fields))) {
+                               DBA::update('contact', $fields, $condition);
+                       }
                }
 
                $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME];
@@ -1166,6 +1168,12 @@ class Contact
 
                self::updateFromProbeArray($contact_id, $data);
 
+               // Don't return a number for a deleted account
+               if (!empty($data['account-type']) && $data['account-type'] == User::ACCOUNT_TYPE_DELETED) {
+                       Logger::info('Contact is a tombstone', ['url' => $url, 'uid' => $uid]);
+                       return 0;
+               }
+
                return $contact_id;
        }
 
@@ -1770,20 +1778,26 @@ class Contact
         *
         * @param integer $id      contact id
         * @param integer $uid     user id
-        * @param string  $url     The profile URL of the contact
+        * @param string  $old_url The previous profile URL of the contact
+        * @param string  $new_url The profile URL of the contact
         * @param array   $fields  The fields that are updated
         *
         * @throws \Exception
         */
-       private static function updateContact($id, $uid, $url, array $fields)
+       private static function updateContact(int $id, int $uid, string $old_url, string $new_url, array $fields)
        {
+               if (Strings::normaliseLink($new_url) != Strings::normaliseLink($old_url)) {
+                       Logger::notice('New URL differs from old URL', ['old' => $old_url, 'new' => $new_url]);
+                       // @todo It is to decide what to do when the URL is changed
+               }
+
                if (!DBA::update('contact', $fields, ['id' => $id])) {
                        Logger::info('Couldn\'t update contact.', ['id' => $id, 'fields' => $fields]);
                        return;
                }
 
                // Search for duplicated contacts and get rid of them
-               if (self::removeDuplicates(Strings::normaliseLink($url), $uid)) {
+               if (self::removeDuplicates(Strings::normaliseLink($new_url), $uid)) {
                        return;
                }
 
@@ -1807,7 +1821,7 @@ class Contact
                }
 
                // Update contact data for all users
-               $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
+               $condition = ['self' => false, 'nurl' => Strings::normaliseLink($old_url)];
 
                $condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB];
                DBA::update('contact', $fields, $condition);
@@ -1870,7 +1884,7 @@ class Contact
                        Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
                }
                DBA::close($duplicates);
-               Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
+               Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl, 'callstack' => System::callstack(20)]);
                return true;
        }
 
@@ -1941,14 +1955,14 @@ class Contact
                // We check after the probing to be able to correct falsely detected contact types.
                if (($contact['contact-type'] == self::TYPE_RELAY) &&
                        (!Strings::compareLink($ret['url'], $contact['url']) || in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]))) {
-                       self::updateContact($id, $uid, $contact['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+                       self::updateContact($id, $uid, $contact['url'], $contact['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
                        Logger::info('Not updating relais', ['id' => $id, 'url' => $contact['url']]);
                        return true;
                }
 
                // If Probe::uri fails the network code will be different ("feed" or "unkn")
-               if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
-                       self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
+               if (($ret['network'] == Protocol::PHANTOM) || (($ret['network'] == Protocol::FEED) && ($ret['network'] != $contact['network']))) {
+                       self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
                        return false;
                }
 
@@ -1998,7 +2012,7 @@ class Contact
                }
 
                if (!$update) {
-                       self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+                       self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
 
                        if (Contact\Relation::isDiscoverable($ret['url'])) {
                                Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
@@ -2039,7 +2053,7 @@ class Contact
 
                unset($ret['photo']);
 
-               self::updateContact($id, $uid, $ret['url'], $ret);
+               self::updateContact($id, $uid, $contact['url'], $ret['url'], $ret);
 
                if (Contact\Relation::isDiscoverable($ret['url'])) {
                        Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);