]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Renamed function
[friendica.git] / src / Model / Contact.php
index 17506a7d31dc6a5e256390cbdd2b0b6bd1ab626e..eb99a9fe0f3a0a75ec4bfa85fc89c8941a50db54 100644 (file)
@@ -4,6 +4,7 @@
  */
 namespace Friendica\Model;
 
+use Friendica\App\BaseURL;
 use Friendica\BaseObject;
 use Friendica\Content\Pager;
 use Friendica\Core\Config;
@@ -22,7 +23,6 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
-use Friendica\Util\BaseURL;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -117,11 +117,9 @@ class Contact extends BaseObject
         * @return array
         * @throws \Exception
         */
-       public static function select(array $fields = [], array $condition = [], array $params = [])
+       public static function selectToArray(array $fields = [], array $condition = [], array $params = [])
        {
-               $statement = DBA::select('contact', $fields, $condition, $params);
-
-               return DBA::toArray($statement);
+               return DBA::selectToArray('contact', $fields, $condition, $params);
        }
 
        /**
@@ -138,6 +136,31 @@ class Contact extends BaseObject
                return $contact;
        }
 
+       /**
+        * Insert a row into the contact table
+        * Important: You can't use DBA::lastInsertId() after this call since it will be set to 0.
+        *
+        * @param array        $param               parameter array
+        * @param bool         $on_duplicate_update Do an update on a duplicate entry
+        *
+        * @return boolean was the insert successful?
+        * @throws \Exception
+        */
+       public static function insert(array $param, bool $on_duplicate_update = false)
+       {
+               $ret = DBA::insert('contact', $param, $on_duplicate_update);
+               $contact = DBA::selectFirst('contact', ['nurl', 'uid'], ['id' => DBA::lastInsertId()]);
+               if (!DBA::isResult($contact)) {
+                       // Shouldn't happen
+                       return $ret;
+               }
+
+               // Search for duplicated contacts and get rid of them
+               self::removeDuplicates($contact['nurl'], $contact['uid']);
+
+               return $ret;
+       }
+
        /**
         * @param integer $id     Contact ID
         * @param array   $fields Array of selected fields, empty for all
@@ -174,6 +197,73 @@ class Contact extends BaseObject
                return DBA::exists('contact', $condition);
        }
 
+       /**
+        * @brief Tests if the given contact url is a follower
+        *
+        * @param string $url Contact URL
+        * @param int    $uid User ID
+        *
+        * @return boolean is the contact id a follower?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function isFollowerByURL($url, $uid)
+       {
+               $cid = self::getIdForURL($url, $uid, true);
+
+               if (empty($cid)) {
+                       return false;
+               }
+
+               return self::isFollower($cid, $uid);
+       }
+
+       /**
+        * @brief Tests if the given user follow the given contact
+        *
+        * @param int $cid Either public contact id or user's contact id
+        * @param int $uid User ID
+        *
+        * @return boolean is the contact url being followed?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function isSharing($cid, $uid)
+       {
+               if (self::isBlockedByUser($cid, $uid)) {
+                       return false;
+               }
+
+               $cdata = self::getPublicAndUserContacID($cid, $uid);
+               if (empty($cdata['user'])) {
+                       return false;
+               }
+
+               $condition = ['id' => $cdata['user'], 'rel' => [self::SHARING, self::FRIEND]];
+               return DBA::exists('contact', $condition);
+       }
+
+       /**
+        * @brief Tests if the given user follow the given contact url
+        *
+        * @param string $url Contact URL
+        * @param int    $uid User ID
+        *
+        * @return boolean is the contact url being followed?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
+        */
+       public static function isSharingByURL($url, $uid)
+       {
+               $cid = self::getIdForURL($url, $uid, true);
+
+               if (empty($cid)) {
+                       return false;
+               }
+
+               return self::isSharing($cid, $uid);
+       }
+
        /**
         * @brief Get the basepath for a given contact link
         *
@@ -795,8 +885,8 @@ class Contact extends BaseObject
                                 * delete, though if the owner tries to unarchive them we'll start
                                 * the whole process over again.
                                 */
-                               DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
-                               DBA::update('contact', ['archive' => 1], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
+                               DBA::update('contact', ['archive' => true], ['id' => $contact['id']]);
+                               DBA::update('contact', ['archive' => true], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
                                GContact::updateFromPublicContactURL($contact['url']);
                        }
                }
@@ -813,6 +903,13 @@ class Contact extends BaseObject
         */
        public static function unmarkForArchival(array $contact)
        {
+               // Always unarchive the relay contact entry
+               if (!empty($contact['batch'])) {
+                       $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+                       $condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
+                       DBA::update('contact', $fields, $condition);
+               }
+
                $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME];
                $exists = DBA::exists('contact', $condition);
 
@@ -834,13 +931,8 @@ class Contact extends BaseObject
                // It's a miracle. Our dead contact has inexplicably come back to life.
                $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
                DBA::update('contact', $fields, ['id' => $contact['id']]);
-               DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
+               DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
                GContact::updateFromPublicContactURL($contact['url']);
-
-               if (!empty($contact['batch'])) {
-                       $condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
-                       DBA::update('contact', $fields, $condition);
-               }
        }
 
        /**
@@ -1313,7 +1405,7 @@ class Contact extends BaseObject
 
                // Then the addr (nick@server.tld)
                if (!DBA::isResult($contact)) {
-                       $contact = DBA::selectFirst('contact', $fields, ['addr' => $url, 'uid' => $uid, 'deleted' => false], $options);
+                       $contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
                }
 
                // Then the alias (which could be anything)
@@ -1352,7 +1444,7 @@ class Contact extends BaseObject
                        // When we don't want to update, we look if we know this contact in any way
                        $data = self::getProbeDataFromDatabase($url, $contact_id);
                        $background_update = true;
-               } elseif ($no_update && !empty($default)) {
+               } elseif ($no_update && !empty($default['network'])) {
                        // If there are default values, take these
                        $data = $default;
                        $background_update = false;
@@ -1418,118 +1510,120 @@ class Contact extends BaseObject
 
                        $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
 
-                       DBA::update('contact', $fields, $condition, true);
+                       // Before inserting we do check if the entry does exist now.
+                       $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
+                       if (!DBA::isResult($contact)) {
+                               Logger::info('Create new contact', $fields);
+
+                               self::insert($fields);
 
-                       $s = DBA::select('contact', ['id'], $condition, ['order' => ['id'], 'limit' => 2]);
-                       $contacts = DBA::toArray($s);
-                       if (!DBA::isResult($contacts)) {
-                               return 0;
+                               // We intentionally aren't using lastInsertId here. There is a chance for duplicates.
+                               $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
+                               if (!DBA::isResult($contact)) {
+                                       Logger::info('Contact creation failed', $fields);
+                                       // Shouldn't happen
+                                       return 0;
+                               }
+                       } else {
+                               Logger::info('Contact had been created before', ['id' => $contact["id"], 'url' => $url, 'contact' => $fields]);
                        }
 
-                       $contact_id = $contacts[0]["id"];
+                       $contact_id = $contact["id"];
+               }
+
+               if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
+                       self::updateAvatar($data['photo'], $uid, $contact_id);
+               }
 
-                       // Update in the background when we fetched the data solely from the database
+               if (in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
                        if ($background_update) {
-                               Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
-                       }
+                               // Update in the background when we fetched the data solely from the database
+                               Worker::add(PRIORITY_MEDIUM, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
+                       } else {
+                               // Else do a direct update
+                               self::updateFromProbe($contact_id, '', false);
 
-                       // Update the newly created contact from data in the gcontact table
-                       $gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => Strings::normaliseLink($data["url"])]);
-                       if (DBA::isResult($gcontact)) {
-                               // Only use the information when the probing hadn't fetched these values
-                               if (!empty($data['keywords'])) {
-                                       unset($gcontact['keywords']);
-                               }
-                               if (!empty($data['location'])) {
-                                       unset($gcontact['location']);
+                               // Update the gcontact entry
+                               if ($uid == 0) {
+                                       GContact::updateFromPublicContactID($contact_id);
                                }
-                               if (!empty($data['about'])) {
-                                       unset($gcontact['about']);
-                               }
-                               DBA::update('contact', $gcontact, ['id' => $contact_id]);
                        }
+               } else {
+                       $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl'];
+                       $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
-                       if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-                               $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self`",
-                                       Strings::normaliseLink($data["url"]), 0, $contact_id];
-                               Logger::log('Deleting duplicate contact ' . json_encode($condition), Logger::DEBUG);
-                               DBA::delete('contact', $condition);
+                       // This condition should always be true
+                       if (!DBA::isResult($contact)) {
+                               return $contact_id;
                        }
-               }
 
-               if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
-                       self::updateAvatar($data['photo'], $uid, $contact_id);
-               }
+                       $updated = [
+                               'url' => $data['url'],
+                               'nurl' => Strings::normaliseLink($data['url']),
+                               'updated' => DateTimeFormat::utcNow()
+                       ];
 
-               $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey', 'baseurl'];
-               $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
+                       $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl'];
 
-               // This condition should always be true
-               if (!DBA::isResult($contact)) {
-                       return $contact_id;
-               }
+                       foreach ($fields as $field) {
+                               $updated[$field] = defaults($data, $field, $contact[$field]);
+                       }
 
-               $updated = [
-                       'addr' => $data['addr'] ?? '',
-                       'alias' => defaults($data, 'alias', ''),
-                       'url' => $data['url'],
-                       'nurl' => Strings::normaliseLink($data['url']),
-                       'name' => $data['name'],
-                       'nick' => $data['nick']
-               ];
+                       if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
+                               $updated['uri-date'] = DateTimeFormat::utcNow();
+                       }
 
-               if (!empty($data['baseurl'])) {
-                       $updated['baseurl'] = $data['baseurl'];
-               }
-               if (!empty($data['keywords'])) {
-                       $updated['keywords'] = $data['keywords'];
-               }
-               if (!empty($data['location'])) {
-                       $updated['location'] = $data['location'];
-               }
+                       if (($data['name'] != $contact['name']) || ($data['nick'] != $contact['nick'])) {
+                               $updated['name-date'] = DateTimeFormat::utcNow();
+                       }
 
-               // Update the technical stuff as well - if filled
-               if (!empty($data['notify'])) {
-                       $updated['notify'] = $data['notify'];
-               }
-               if (!empty($data['poll'])) {
-                       $updated['poll'] = $data['poll'];
-               }
-               if (!empty($data['batch'])) {
-                       $updated['batch'] = $data['batch'];
-               }
-               if (!empty($data['request'])) {
-                       $updated['request'] = $data['request'];
-               }
-               if (!empty($data['confirm'])) {
-                       $updated['confirm'] = $data['confirm'];
-               }
-               if (!empty($data['poco'])) {
-                       $updated['poco'] = $data['poco'];
+                       DBA::update('contact', $updated, ['id' => $contact_id], $contact);
                }
 
-               // Only fill the pubkey if it had been empty before. We have to prevent identity theft.
-               if (empty($contact['pubkey']) && !empty($data['pubkey'])) {
-                       $updated['pubkey'] = $data['pubkey'];
-               }
+               return $contact_id;
+       }
 
-               if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
-                       $updated['uri-date'] = DateTimeFormat::utcNow();
+       /**
+        * @brief Checks if the contact is archived
+        *
+        * @param int $cid contact id
+        *
+        * @return boolean Is the contact archived?
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public static function isArchived(int $cid)
+       {
+               if ($cid == 0) {
+                       return false;
                }
-               if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
-                       $updated['name-date'] = DateTimeFormat::utcNow();
+
+               $contact = DBA::selectFirst('contact', ['archive', 'url', 'batch'], ['id' => $cid]);
+               if (!DBA::isResult($contact)) {
+                       return false;
                }
 
-               $updated['updated'] = DateTimeFormat::utcNow();
+               if ($contact['archive']) {
+                       return true;
+               }
 
-               DBA::update('contact', $updated, ['id' => $contact_id], $contact);
+               // Check status of ActivityPub endpoints
+               $apcontact = APContact::getByURL($contact['url'], false);
+               if (!empty($apcontact)) {
+                       if (!empty($apcontact['inbox']) && DBA::exists('inbox-status', ['archive' => true, 'url' => $apcontact['inbox']])) {
+                               return true;
+                       }
 
-               if (!$background_update && ($uid == 0)) {
-                       // Update the gcontact entry
-                       GContact::updateFromPublicContactID($contact_id);
+                       if (!empty($apcontact['sharedinbox']) && DBA::exists('inbox-status', ['archive' => true, 'url' => $apcontact['sharedinbox']])) {
+                               return true;
+                       }
                }
 
-               return $contact_id;
+               // Check status of Diaspora endpoints
+               if (!empty($contact['batch'])) {
+                       return DBA::exists('contact', ['archive' => true, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY]);
+                }
+
+               return false;
        }
 
        /**
@@ -1771,16 +1865,22 @@ class Contact extends BaseObject
         /**
         * @brief Helper function for "updateFromProbe". Updates personal and public contact
         *
-        * @param array $contact The personal contact entry
-        * @param array $fields  The fields that are updated
+        * @param integer $id      contact id
+        * @param integer $uid     user id
+        * @param string  $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)
        {
-               DBA::update('contact', $fields, ['id' => $id]);
+               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::handleDuplicates(Strings::normaliseLink($url), $uid, $id) || ($uid != 0)) {
+               if (self::removeDuplicates(Strings::normaliseLink($url), $uid) || ($uid != 0)) {
                        return;
                }
 
@@ -1790,6 +1890,11 @@ class Contact extends BaseObject
                // Archive or unarchive the contact. We only need to do this for the public contact.
                // The archive/unarchive function will update the personal contacts by themselves.
                $contact = DBA::selectFirst('contact', [], ['id' => $id]);
+               if (!DBA::isResult($contact)) {
+                       Logger::info('Couldn\'t select contact for archival.', ['id' => $id]);
+                       return;
+               }
+
                if (!empty($fields['success_update'])) {
                        self::unmarkForArchival($contact);
                } elseif (!empty($fields['failure_update'])) {
@@ -1817,49 +1922,44 @@ class Contact extends BaseObject
        }
 
         /**
-        * @brief Helper function for "updateFromProbe". Remove duplicated contacts
+        * @brief Remove duplicated contacts
         *
         * @param string  $nurl  Normalised contact url
         * @param integer $uid   User id
-        * @param integer $id    Contact id of a duplicate
+        * @return boolean
         * @throws \Exception
         */
-       private static function handleDuplicates($nurl, $uid, $id)
+       public static function removeDuplicates(string $nurl, int $uid)
        {
-               $condition = ['nurl' => $nurl, 'uid' => $uid, 'deleted' => false];
+               $condition = ['nurl' => $nurl, 'uid' => $uid, 'deleted' => false, 'network' => Protocol::FEDERATED];
                $count = DBA::count('contact', $condition);
                if ($count <= 1) {
                        return false;
                }
 
-               $first_contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
+               $first_contact = DBA::selectFirst('contact', ['id', 'network'], $condition, ['order' => ['id']]);
                if (!DBA::isResult($first_contact)) {
                        // Shouldn't happen - so we handle it
                        return false;
                }
 
                $first = $first_contact['id'];
-               Logger::info('Found duplicates', ['count' => $count, 'id' => $id, 'first' => $first, 'uid' => $uid, 'nurl' => $nurl, 'callstack' => System::callstack(20)]);
-               if ($uid != 0) {
-                       // Don't handle non public duplicates by now
-                       Logger::info('Not handling non public duplicate', ['uid' => $uid, 'nurl' => $nurl]);
+               Logger::info('Found duplicates', ['count' => $count, 'first' => $first, 'uid' => $uid, 'nurl' => $nurl]);
+               if (($uid != 0 && ($first_contact['network'] == Protocol::DFRN))) {
+                       // Don't handle non public DFRN duplicates by now (legacy DFRN is very special because of the key handling)
+                       Logger::info('Not handling non public DFRN duplicate', ['uid' => $uid, 'nurl' => $nurl]);
                        return false;
                }
 
                // Find all duplicates
                $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self` AND NOT `deleted`", $nurl, $uid, $first];
-               $duplicates = DBA::select('contact', ['id'], $condition);
+               $duplicates = DBA::select('contact', ['id', 'network'], $condition);
                while ($duplicate = DBA::fetch($duplicates)) {
-                       $dup_id = $duplicate['id'];
-                       Logger::info('Handling duplicate', ['search' => $dup_id, 'replace' => $first]);
-
-                       // Search and replace
-                       DBA::update('item',['author-id' => $first], ['author-id' => $dup_id]);
-                       DBA::update('item',['owner-id' => $first], ['owner-id' => $dup_id]);
-                       DBA::update('item',['contact-id' => $first], ['contact-id' => $dup_id]);
+                       if (!in_array($duplicate['network'], Protocol::FEDERATED)) {
+                               continue;
+                       }
 
-                       // Remove the duplicate
-                       DBA::delete('contact', ['id' => $dup_id]);
+                       Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
                }
                Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
                return true;
@@ -1885,7 +1985,7 @@ class Contact extends BaseObject
 
                $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'gender',
                        'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
-                       'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type'];
+                       'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type', 'pubkey'];
                $contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
                if (!DBA::isResult($contact)) {
                        return false;
@@ -1894,6 +1994,9 @@ class Contact extends BaseObject
                $uid = $contact['uid'];
                unset($contact['uid']);
 
+               $pubkey = $contact['pubkey'];
+               unset($contact['pubkey']);
+
                $contact['photo'] = $contact['avatar'];
                unset($contact['avatar']);
 
@@ -1901,6 +2004,15 @@ class Contact extends BaseObject
 
                $updated = DateTimeFormat::utcNow();
 
+               // We must not try to update relay contacts via probe. They are no real contacts.
+               // 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'], ['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 (mostly "feed" or "unkn")
                if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT) ||
                        (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network']))) {
@@ -1927,6 +2039,8 @@ class Contact extends BaseObject
                        }
                }
 
+               $new_pubkey = $ret['pubkey'];
+
                $update = false;
 
                // make sure to not overwrite existing values with blank entries except some technical fields
@@ -1934,7 +2048,7 @@ class Contact extends BaseObject
                foreach ($ret as $key => $val) {
                        if (!array_key_exists($key, $contact)) {
                                unset($ret[$key]);
-                       } elseif (($contact[$key] != '') && ($val == '') && !is_bool($ret[$key]) && !in_array($key, $keep)) {
+                       } elseif (($contact[$key] != '') && ($val === '') && !is_bool($ret[$key]) && !in_array($key, $keep)) {
                                $ret[$key] = $contact[$key];
                        } elseif ($ret[$key] != $contact[$key]) {
                                $update = true;
@@ -1946,7 +2060,7 @@ class Contact extends BaseObject
                }
 
                if (!$update) {
-                       if ($force && ($uid == 0)) {
+                       if ($force) {
                                self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
                        }
                        return true;
@@ -1955,6 +2069,19 @@ class Contact extends BaseObject
                $ret['nurl'] = Strings::normaliseLink($ret['url']);
                $ret['updated'] = $updated;
 
+               // Only fill the pubkey if it had been empty before. We have to prevent identity theft.
+               if (empty($pubkey) && !empty($new_pubkey)) {
+                       $ret['pubkey'] = $new_pubkey;
+               }
+
+               if (($ret['addr'] != $contact['addr']) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
+                       $ret['uri-date'] = DateTimeFormat::utcNow();
+               }
+
+               if (($ret['name'] != $contact['name']) || ($ret['nick'] != $contact['nick'])) {
+                       $ret['name-date'] = $updated;
+               }
+
                if ($force && ($uid == 0)) {
                        $ret['last-update'] = $updated;
                        $ret['success_update'] = $updated;
@@ -2164,7 +2291,7 @@ class Contact extends BaseObject
                        $new_relation = (in_array($protocol, [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
 
                        // create contact record
-                       DBA::insert('contact', [
+                       self::insert([
                                'uid'     => $uid,
                                'created' => DateTimeFormat::utcNow(),
                                'url'     => $ret['url'],
@@ -2325,7 +2452,18 @@ class Contact extends BaseObject
                $nick = $pub_contact['nick'];
                $network = $pub_contact['network'];
 
+               // Ensure that we don't create a new contact when there already is one
+               $cid = self::getIdForURL($url, $importer['uid']);
+               if (!empty($cid)) {
+                       $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+               }
+
                if (!empty($contact)) {
+                       if (!empty($contact['pending'])) {
+                               Logger::info('Pending contact request already exists.', ['url' => $url, 'uid' => $importer['uid']]);
+                               return null;
+                       }
+
                        // Contact is blocked at user-level
                        if (!empty($contact['id']) && !empty($importer['id']) &&
                                self::isBlockedByUser($contact['id'], $importer['id'])) {