Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 07:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fetch more comtact data from probing, remove duplicated contacts

Browse source
This commit is contained in:
Michael 2019-07-12 14:55:23 +00:00
parent a06de3127f
commit 8cbdc7939e
4 changed files with 88 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Protocol/DFRN.php
View file

@ -1693,13 +1693,12 @@ class DFRN
'location' => $contact['location'], 'addr' => $contact['addr'], 'keywords' => $contact['keywords'],
'bdyear' => $contact['bdyear'], 'bd' => $contact['bd'], 'hidden' => $contact['hidden'],
'xmpp' => $contact['xmpp'], 'name-date' => DateTimeFormat::utc($contact['name-date']),
'uri-date' => DateTimeFormat::utc($contact['uri-date'])];
'unsearchable' => $contact['hidden'], 'uri-date' => DateTimeFormat::utc($contact['uri-date'])];
DBA::update('contact', $fields, ['id' => $contact['id'], 'network' => $contact['network']], $contact_old);
// Update the public contact. Don't set the "hidden" value, this is used differently for public contacts
unset($fields['hidden']);
$fields['unsearchable'] = $hide;
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($contact_old['url'])];
DBA::update('contact', $fields, $condition, true);

2
src/Protocol/Diaspora.php
View file

@ -2267,6 +2267,8 @@ class Diaspora
DBA::update('contact', $fields, ['id' => $contact['id']]);
// @todo Update the public contact, then update the gcontact from that
$gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2,
"photo" => $image_url, "name" => $name, "location" => $location,
"about" => $about, "birthday" => $birthday, "gender" => $gender,