Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-20 09:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Process all data that we can fetch via probing

Browse source
This commit is contained in:
Michael 2017-07-12 05:56:35 +00:00
parent a8db1282e2
commit a47e1e13d7
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/Contact.php
View file

@ -567,26 +567,20 @@ function get_contact($url, $uid = 0, $no_update = false) {
// Get data from the gcontact table
$gcontacts = dba::select('gcontact', array('name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'),
array('nurl' => normalise_link($url)), array('limit' => 1));
if (!$gcontacts) {
if (!dbm::is_result($gcontacts)) {
return 0;
}
$data = $gcontacts;
$data = array_merge($data, $gcontacts);
}
$url = $data["url"];
if (!$contact_id) {
if (!isset($data['priority'])) {
$data['priority'] = 0;
}
if (!isset($data['batch'])) {
$data['batch'] = '';
}
dba::insert('contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"],
'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"],
'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"],
'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"],
'keywords' => $data["keywords"], 'location' => $data["location"], 'about' => $data["about"],
'network' => $data["network"], 'pubkey' => $data["pubkey"],
'rel' => CONTACT_IS_SHARING, 'priority' => $data["priority"],
'batch' => $data["batch"], 'request' => $data["request"],
@ -608,6 +602,16 @@ function get_contact($url, $uid = 0, $no_update = false) {
$gcontact = dba::select('gcontact', array('location', 'about', 'keywords', 'gender'),
array('nurl' => normalise_link($data["url"])), array('limit' => 1));
if (dbm::is_result($gcontact)) {
// Only use the information when the probing hadn't fetched these values
if ($data['keywords'] != '') {
unset($gcontact['keywords']);
}
if ($data['location'] != '') {
unset($gcontact['location']);
}
if ($data['about'] != '') {
unset($gcontact['about']);
}
dba::update('contact', $gcontact, array('id' => $contact_id));
}