/**
* @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
*
*/
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 '';
}
/**
*/
DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
DBA::update('contact', ['archive' => 1], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
+ GContact::updateFromPublicContactURL($contact['url']);
}
}
}
$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];
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
/// @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)
// 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)) {
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;
}
}
- // 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)) {
'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(),
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
'nick' => $data['nick']
];
+ if (!empty($data['baseurl'])) {
+ $updated['baseurl'] = $data['baseurl'];
+ }
if (!empty($data['keywords'])) {
$updated['keywords'] = $data['keywords'];
}
}
// 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'];
}
DBA::update('contact', $updated, ['id' => $contact_id], $contact);
+ if (!$background_update && ($uid == 0)) {
+ // Update the gcontact entry
+ GContact::updateFromPublicContactID($contact_id);
+ }
+
return $contact_id;
}
return '';
}
- if (in_array($contact["network"], array_merge(Protocol::FEDERATED ,['']))) {
+ if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
} else {
$sql = "`item`.`uid` = ?";
$pager = new Pager($a->query_string);
- $params = ['order' => ['created' => true],
+ $params = ['order' => ['received' => true],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
if ($thread_mode) {
{
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]);
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
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;
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;
self::updateContact($id, $uid, $ret['url'], $ret);
- // Update the corresponding gcontact entry
-// PortableContact::lastUpdated($ret["url"]);
- 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
*
'name' => $ret['name'],
'nick' => $ret['nick'],
'network' => $ret['network'],
+ 'baseurl' => $ret['baseurl'],
'protocol' => $protocol,
'pubkey' => $ret['pubkey'],
'rel' => $new_relation,
projects / friendica.git / blobdiff