clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6388 from annando/update-contacts 

Periodically update contacts / update the contact type
This commit is contained in:
Hypolite Petovan 2019-01-05 23:43:38 -05:00 committed by GitHub
parent 93ba6ced32 3022abe74c
commit 00cc3e779b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Model/APContact.php
View File

@ -61,7 +61,7 @@ class APContact extends BaseObject
* Fetches a profile from a given url
*
* @param string $url profile url
* @param boolean $update true = always update, false = never update, null = update when not found
* @param boolean $update true = always update, false = never update, null = update when not found or outdated
* @return array profile array
*/
public static function getByURL($url, $update = null)
@ -71,18 +71,22 @@ class APContact extends BaseObject
}
if (empty($update)) {
if (is_null($update)) {
$ref_update = DateTimeFormat::utc('now - 1 month');
} else {
$ref_update = DBA::NULL_DATETIME;
}
$apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
if (DBA::isResult($apcontact)) {
return $apcontact;
if (!DBA::isResult($apcontact)) {
$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
}
$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
if (DBA::isResult($apcontact)) {
return $apcontact;
if (!DBA::isResult($apcontact)) {
$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
}
$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
if (DBA::isResult($apcontact)) {
if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update)) {
return $apcontact;
}
@ -185,6 +189,22 @@ class APContact extends BaseObject
// Update some data in the contact table with various ways to catch them all
$contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about']];
// Fetch the type and match it with the contact type
$contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
if (!empty($contact_types)) {
$contact_type = array_pop($contact_types);
if (is_int($contact_type)) {
$contact_fields['contact-type'] = $contact_type;
// Resetting the 'forum' and 'prv' field when it isn't a forum
if ($contact_fields['contact-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
$contact_fields['forum'] = false;
$contact_fields['prv'] = false;
}
}
}
DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
$contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);
@ -194,6 +214,9 @@ class APContact extends BaseObject
DBA::close($contacts);
// Update the gcontact table
// These two fields don't exist in the gcontact table
unset($contact_fields['forum']);
unset($contact_fields['prv']);
DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
Logger::log('Updated profile for ' . $url, Logger::DEBUG);