tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fetch data from the given contact number, if already present

Browse source
This commit is contained in:
Michael 2019-04-09 08:47:57 +00:00
parent bca7419987
commit 84a6e390ab
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Model/Contact.php
View file

@ -1121,11 +1121,12 @@ class Contact extends BaseObject
* Have a look at all contact tables for a given profile url. * Have a look at all contact tables for a given profile url.
* This function works as a replacement for probing the contact. * This function works as a replacement for probing the contact.
* *
* @param string $url Contact URL * @param string $url Contact URL
* @param integer $cid Contact ID
* *
* @return array Contact array in the "probe" structure * @return array Contact array in the "probe" structure
*/ */
private static function getProbeDataFromDatabase($url) private static function getProbeDataFromDatabase($url, $cid)
{ {
// The link could be provided as http although we stored it as https // The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url); $ssl_url = str_replace('http://', 'https://', $url);
@ -1133,6 +1134,14 @@ class Contact extends BaseObject
$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
'photo', 'keywords', 'location', 'about', 'network', 'photo', 'keywords', 'location', 'about', 'network',
'priority', 'batch', 'request', 'confirm', 'poco']; 'priority', 'batch', 'request', 'confirm', 'poco'];
if (!empty($cid)) {
$data = DBA::selectFirst('contact', $fields, ['id' => $cid]);
if (DBA::isResult($data)) {
return $data;
}
}
$data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]); $data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]);
if (!DBA::isResult($data)) { if (!DBA::isResult($data)) {
@ -1273,7 +1282,7 @@ class Contact extends BaseObject
// When we don't want to update, we look if we know this contact in any way // When we don't want to update, we look if we know this contact in any way
if ($no_update && empty($default)) { if ($no_update && empty($default)) {
$data = self::getProbeDataFromDatabase($url); $data = self::getProbeDataFromDatabase($url, $contact_id);
$background_update = true; $background_update = true;
} else { } else {
$data = []; $data = [];
@ -1295,7 +1304,7 @@ class Contact extends BaseObject
return 0; return 0;
} }
$contact = array_merge(self::getProbeDataFromDatabase($url), $default); $contact = array_merge(self::getProbeDataFromDatabase($url, $contact_id), $default);
if (empty($contact)) { if (empty($contact)) {
return 0; return 0;
} }