bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10465 from annando/local-follow

Browse source 
Fix local follow (and local contact data update)
This commit is contained in:
Hypolite Petovan 2021-07-04 10:15:10 -04:00 committed by GitHub
commit b84c68f024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Model/Contact.php
View file

@ -2051,7 +2051,11 @@ class Contact
}
if (self::isLocal($ret['url'])) {
Logger::info('Local contacts are not updated here.');
if ($contact['uid'] == 0) {
Logger::info('Local contacts are not updated here.');
} else {
self::updateFromPublicContact($id, $contact);
}
return true;
}
@ -2186,6 +2190,26 @@ class Contact
return true;
}
private static function updateFromPublicContact(int $id, array $contact)
{
$public = self::getByURL($contact['url'], false);
$fields = [];
foreach ($contact as $field => $value) {
if ($field == 'uid') {
continue;
}
if ($public[$field] != $value) {
$fields[$field] = $public[$field];
}
}
if (!empty($fields)) {
DBA::update('contact', $fields, ['id' => $id, 'self' => false]);
Logger::info('Updating local contact', ['id' => $id]);
}
}
/**
* @param integer $url contact url
* @return integer Contact id
@ -2294,8 +2318,10 @@ class Contact
}
if (!empty($arr['contact']['name'])) {
$probed = false;
$ret = $arr['contact'];
} else {
$probed = true;
$ret = Probe::uri($url, $network, $user['uid']);
}
@ -2439,6 +2465,10 @@ class Contact
// pull feed and consume it, which should subscribe to the hub.
if ($contact['network'] == Protocol::OSTATUS) {
Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
}
if ($probed) {
self::updateFromProbeArray($contact_id, $ret);
} else {
Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
}