X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=17506a7d31dc6a5e256390cbdd2b0b6bd1ab626e;hb=c34204cf50ced68a14d220706c4dc6ef93eb94c9;hp=a10c0d05e5f4599a610fad5188da9b578a59a2a0;hpb=ee8baf00ce35f3198aef34f2cc41200262623efa;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index a10c0d05e5..17506a7d31 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -176,7 +176,6 @@ class Contact extends BaseObject /** * @brief Get the basepath for a given contact link - * @todo Add functionality to store this value in the contact table * * @param string $url The contact link * @@ -186,13 +185,19 @@ class Contact extends BaseObject */ public static function getBasepath($url) { - $data = Probe::uri($url); - if (!empty($data['baseurl'])) { - return $data['baseurl']; + $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]); + if (!empty($contact['baseurl'])) { + return $contact['baseurl']; + } + + self::updateFromProbeByURL($url, true); + + $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]); + if (!empty($contact['baseurl'])) { + return $contact['baseurl']; } - // When we can't probe the server, we use some ugly function that does some pattern matching - return PortableContact::detectServer($url); + return ''; } /** @@ -792,6 +797,7 @@ class Contact extends BaseObject */ DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]); DBA::update('contact', ['archive' => 1], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]); + GContact::updateFromPublicContactURL($contact['url']); } } } @@ -829,6 +835,7 @@ class Contact extends BaseObject $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false]; DBA::update('contact', $fields, ['id' => $contact['id']]); DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]); + GContact::updateFromPublicContactURL($contact['url']); if (!empty($contact['batch'])) { $condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY]; @@ -965,7 +972,7 @@ class Contact extends BaseObject if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0) && in_array($profile["network"], Protocol::FEDERATED) ) { - Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]); + Worker::add(PRIORITY_LOW, "UpdateGContact", $url); } // Show contact details of Diaspora contacts only if connected @@ -1300,11 +1307,13 @@ class Contact extends BaseObject /// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following // We first try the nurl (http://server.tld/nick), most common case - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]); + $fields = ['id', 'avatar', 'updated', 'network']; + $options = ['order' => ['id']]; + $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options); // Then the addr (nick@server.tld) if (!DBA::isResult($contact)) { - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]); + $contact = DBA::selectFirst('contact', $fields, ['addr' => $url, 'uid' => $uid, 'deleted' => false], $options); } // Then the alias (which could be anything) @@ -1312,7 +1321,7 @@ class Contact extends BaseObject // The link could be provided as http although we stored it as https $ssl_url = str_replace('http://', 'https://', $url); $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid]; - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], $condition); + $contact = DBA::selectFirst('contact', $fields, $condition, $options); } if (DBA::isResult($contact)) { @@ -1339,10 +1348,14 @@ class Contact extends BaseObject return 0; } - // When we don't want to update, we look if we know this contact in any way if ($no_update && empty($default)) { + // 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)) { + // If there are default values, take these + $data = $default; + $background_update = false; } else { $data = []; $background_update = false; @@ -1357,18 +1370,9 @@ class Contact extends BaseObject } } - // Last try in gcontact for unsupported networks - if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) { - if ($uid != 0) { - return 0; - } - - $contact = array_merge(self::getProbeDataFromDatabase($url, $contact_id), $default); - if (empty($contact)) { - return 0; - } - - $data = array_merge($data, $contact); + // Take the default values when probing failed + if (!empty($default) && !in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) { + $data = array_merge($data, $default); } if (empty($data)) { @@ -1403,6 +1407,7 @@ class Contact extends BaseObject 'request' => defaults($data, 'request', ''), 'confirm' => defaults($data, 'confirm', ''), 'poco' => defaults($data, 'poco', ''), + 'baseurl' => defaults($data, 'baseurl', ''), 'name-date' => DateTimeFormat::utcNow(), 'uri-date' => DateTimeFormat::utcNow(), 'avatar-date' => DateTimeFormat::utcNow(), @@ -1456,7 +1461,7 @@ class Contact extends BaseObject self::updateAvatar($data['photo'], $uid, $contact_id); } - $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey']; + $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey', 'baseurl']; $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]); // This condition should always be true @@ -1473,6 +1478,9 @@ class Contact extends BaseObject 'nick' => $data['nick'] ]; + if (!empty($data['baseurl'])) { + $updated['baseurl'] = $data['baseurl']; + } if (!empty($data['keywords'])) { $updated['keywords'] = $data['keywords']; } @@ -1501,7 +1509,7 @@ class Contact extends BaseObject } // Only fill the pubkey if it had been empty before. We have to prevent identity theft. - if (empty($contact['pubkey'])) { + if (empty($contact['pubkey']) && !empty($data['pubkey'])) { $updated['pubkey'] = $data['pubkey']; } @@ -1516,6 +1524,11 @@ class Contact extends BaseObject DBA::update('contact', $updated, ['id' => $contact_id], $contact); + if (!$background_update && ($uid == 0)) { + // Update the gcontact entry + GContact::updateFromPublicContactID($contact_id); + } + return $contact_id; } @@ -1605,7 +1618,7 @@ class Contact extends BaseObject $pager = new Pager($a->query_string); - $params = ['order' => ['created' => true], + $params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; if ($thread_mode) { @@ -1766,10 +1779,14 @@ class Contact extends BaseObject { DBA::update('contact', $fields, ['id' => $id]); - if ($uid != 0) { + // Search for duplicated contacts and get rid of them + if (self::handleDuplicates(Strings::normaliseLink($url), $uid, $id) || ($uid != 0)) { return; } + // Update the corresponding gcontact entry + GContact::updateFromPublicContactID($id); + // 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]); @@ -1799,6 +1816,55 @@ class Contact extends BaseObject DBA::update('contact', $fields, $condition); } + /** + * @brief Helper function for "updateFromProbe". Remove duplicated contacts + * + * @param string $nurl Normalised contact url + * @param integer $uid User id + * @param integer $id Contact id of a duplicate + * @throws \Exception + */ + private static function handleDuplicates($nurl, $uid, $id) + { + $condition = ['nurl' => $nurl, 'uid' => $uid, 'deleted' => false]; + $count = DBA::count('contact', $condition); + if ($count <= 1) { + return false; + } + + $first_contact = DBA::selectFirst('contact', ['id'], $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]); + 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); + 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]); + + // Remove the duplicate + DBA::delete('contact', ['id' => $dup_id]); + } + Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]); + return true; + } + /** * @param integer $id contact id * @param string $network Optional network we are probing for @@ -1814,8 +1880,12 @@ class Contact extends BaseObject This will reliably kill your communication with old Friendica contacts. */ - $fields = ['avatar', 'uid', 'name', 'nick', 'url', 'addr', 'batch', 'notify', - 'poll', 'request', 'confirm', 'poco', 'network', 'alias']; + // These fields aren't updated by this routine: + // 'xmpp', 'sensitive' + + $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']; $contact = DBA::selectFirst('contact', $fields, ['id' => $id]); if (!DBA::isResult($contact)) { return false; @@ -1840,13 +1910,31 @@ class Contact extends BaseObject return false; } + if (isset($ret['hide']) && is_bool($ret['hide'])) { + $ret['unsearchable'] = $ret['hide']; + } + + if (isset($ret['account-type']) && is_int($ret['account-type'])) { + $ret['forum'] = false; + $ret['prv'] = false; + $ret['contact-type'] = $ret['account-type']; + if ($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) { + $apcontact = APContact::getByURL($ret['url'], false); + if (isset($apcontact['manually-approve'])) { + $ret['forum'] = (bool)!$apcontact['manually-approve']; + $ret['prv'] = (bool)!$ret['forum']; + } + } + } + $update = false; - // make sure to not overwrite existing values with blank entries + // make sure to not overwrite existing values with blank entries except some technical fields + $keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl']; foreach ($ret as $key => $val) { - if (!isset($contact[$key])) { + if (!array_key_exists($key, $contact)) { unset($ret[$key]); - } elseif (($contact[$key] != '') && ($val == '')) { + } elseif (($contact[$key] != '') && ($val == '') && !is_bool($ret[$key]) && !in_array($key, $keep)) { $ret[$key] = $contact[$key]; } elseif ($ret[$key] != $contact[$key]) { $update = true; @@ -1876,12 +1964,22 @@ class Contact extends BaseObject self::updateContact($id, $uid, $ret['url'], $ret); - // Update the corresponding gcontact entry - GContact::updateFromProbe($ret['url']); - return true; } + public static function updateFromProbeByURL($url, $force = false) + { + $id = self::getIdForURL($url); + + if (empty($id)) { + return $id; + } + + self::updateFromProbe($id, '', $force); + + return $id; + } + /** * Detects if a given contact array belongs to a legacy DFRN connection * @@ -2080,6 +2178,7 @@ class Contact extends BaseObject 'name' => $ret['name'], 'nick' => $ret['nick'], 'network' => $ret['network'], + 'baseurl' => $ret['baseurl'], 'protocol' => $protocol, 'pubkey' => $ret['pubkey'], 'rel' => $new_relation,