mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7323 from annando/contact-discovery

Browse source 
Removing functionality from OnePoll.php
This commit is contained in:
Hypolite Petovan 2019-06-28 07:08:57 -04:00 committed by GitHub
commit 7b4bba66db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 599 additions and 609 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/Model/Contact.php
View file

@ -1328,7 +1328,7 @@ class Contact extends BaseObject
// Update the contact in the background if needed but it is called by the frontend
if ($update_contact && $no_update && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
}
if (!$update_contact || $no_update) {
@ -1425,7 +1425,7 @@ class Contact extends BaseObject
// Update in the background when we fetched the data solely from the database
if ($background_update) {
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
}
// Update the newly created contact from data in the gcontact table
@ -1452,7 +1452,7 @@ class Contact extends BaseObject
}
}
if (!empty($data['photo'])) {
if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
self::updateAvatar($data['photo'], $uid, $contact_id);
}
@ -1755,6 +1755,51 @@ class Contact extends BaseObject
return $data;
}
/**
* @brief Helper function for "updateFromProbe". Updates personal and public contact
*
* @param array $contact The personal contact entry
* @param array $fields The fields that are updated
* @throws \Exception
*/
private static function updateContact($id, $uid, $url, array $fields)
{
DBA::update('contact', $fields, ['id' => $id]);
if ($uid != 0) {
return;
}
// Archive or unarchive the contact. We only need to do this for the public contact.
// The archive/unarchive function will update the personal contacts by themselves.
$contact = DBA::selectFirst('contact', [], ['id' => $id]);
if (!empty($fields['success_update'])) {
self::unmarkForArchival($contact);
} elseif (!empty($fields['failure_update'])) {
self::markForArchival($contact);
}
$condition = ['self' => false, 'nurl' => Strings::normaliseLink($url),
'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
// These contacts are sharing with us, we don't poll them.
// This means that we don't set the update fields in "OnePoll.php".
$condition['rel'] = self::SHARING;
DBA::update('contact', $fields, $condition);
unset($fields['last-update']);
unset($fields['success_update']);
unset($fields['failure_update']);
if (empty($fields)) {
return;
}
// We are polling these contacts, so we mustn't set the update fields here.
$condition['rel'] = [self::FOLLOWER, self::FRIEND];
DBA::update('contact', $fields, $condition);
}
/**
* @param integer $id contact id
* @param string $network Optional network we are probing for
@ -1767,7 +1812,7 @@ class Contact extends BaseObject
{
/*
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
This will reliably kill your communication with Friendica contacts.
This will reliably kill your communication with old Friendica contacts.
*/
$fields = ['avatar', 'uid', 'name', 'nick', 'url', 'addr', 'batch', 'notify',
@ -1785,12 +1830,14 @@ class Contact extends BaseObject
$ret = Probe::uri($contact['url'], $network, $uid, !$force);
// If Probe::uri fails the network code will be different (mostly "feed" or "unkn")
if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
return false;
}
$updated = DateTimeFormat::utcNow();
if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT)) {
// If Probe::uri fails the network code will be different (mostly "feed" or "unkn")
if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT) ||
(in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network']))) {
if ($force && ($uid == 0)) {
self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'failure_update' => $updated]);
}
return false;
}
@ -1807,17 +1854,28 @@ class Contact extends BaseObject
}
}
if ($ret['network'] != Protocol::FEED) {
self::updateAvatar($ret['photo'], $uid, $id, $update || $force);
}
if (!$update) {
if ($force && ($uid == 0)) {
self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
}
return true;
}
$ret['nurl'] = Strings::normaliseLink($ret['url']);
$ret['updated'] = DateTimeFormat::utcNow();
$ret['updated'] = $updated;
self::updateAvatar($ret['photo'], $uid, $id, true);
if ($force && ($uid == 0)) {
$ret['last-update'] = $updated;
$ret['success_update'] = $updated;
}
unset($ret['photo']);
DBA::update('contact', $ret, ['id' => $id]);
self::updateContact($id, $uid, $ret['url'], $ret);
// Update the corresponding gcontact entry
PortableContact::lastUpdated($ret["url"]);

136
src/Worker/Cron.php
View file

@ -17,16 +17,10 @@ use Friendica\Util\DateTimeFormat;
class Cron
{
public static function execute($parameter = '', $generation = 0)
public static function execute()
{
$a = BaseObject::getApp();
// Poll contacts with specific parameters
if (!empty($parameter)) {
self::pollContacts($parameter, $generation);
return;
}
$last = Config::get('system', 'last_cron');
$poll_interval = intval(Config::get('system', 'cron_interval'));
@ -115,7 +109,10 @@ class Cron
}
// Poll contacts
self::pollContacts($parameter, $generation);
self::pollContacts();
// Update contact information
self::updatePublicContacts();
Logger::log('cron: end');
@ -125,98 +122,76 @@ class Cron
}
/**
* @brief Poll contacts for unreceived messages
*
* @todo Currently it seems as if the following parameter aren't used at all ...
*
* @param string $parameter Parameter (force, restart, ...) for the contact polling
* @param integer $generation
* @brief Update public contacts
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function pollContacts($parameter, $generation) {
$manual_id = 0;
$generation = 0;
$force = false;
private static function updatePublicContacts() {
$count = 0;
$last_updated = DateTimeFormat::utc('now - 1 week');
$condition = ["`network` IN (?, ?, ?, ?) AND `uid` = ? AND NOT `self` AND `last-update` < ?",
Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, 0, $last_updated];
if ($parameter == 'force') {
$force = true;
}
if ($parameter == 'restart') {
$generation = intval($generation);
if (!$generation) {
exit();
$total = DBA::count('contact', $condition);
$oldest_date = '';
$oldest_id = '';
$contacts = DBA::select('contact', ['id', 'last-update'], $condition, ['limit' => 100, 'order' => ['last-update']]);
while ($contact = DBA::fetch($contacts)) {
if (empty($oldest_id)) {
$oldest_id = $contact['id'];
$oldest_date = $contact['last-update'];
}
Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], 'force');
++$count;
}
Logger::info('Initiated update for public contacts', ['interval' => $count, 'total' => $total, 'id' => $oldest_id, 'oldest' => $oldest_date]);
DBA::close($contacts);
}
if (intval($parameter)) {
$manual_id = intval($parameter);
$force = true;
}
/**
* @brief Poll contacts for unreceived messages
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function pollContacts() {
$min_poll_interval = Config::get('system', 'min_poll_interval', 1);
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
Addon::reload();
// Only poll from those with suitable relationships,
// and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
if ($abandon_days < 1) {
$abandon_days = 0;
}
$abandon_sql = (($abandon_days)
? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
: ''
);
$contacts = q("SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`, `contact`.`archive`,
$sql = "SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`, `contact`.`archive`,
`contact`.`last-update`, `contact`.`priority`, `contact`.`rel`, `contact`.`subhub`
FROM `user`
STRAIGHT_JOIN `contact`
ON `contact`.`uid` = `user`.`uid` AND `contact`.`poll` != ''
AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra
AND `contact`.`network` IN (?, ?, ?, ?)
AND NOT `contact`.`self` AND NOT `contact`.`blocked`
WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
DBA::escape(Protocol::ACTIVITYPUB),
DBA::escape(Protocol::DFRN),
DBA::escape(Protocol::OSTATUS),
DBA::escape(Protocol::DIASPORA),
DBA::escape(Protocol::FEED),
DBA::escape(Protocol::MAIL)
);
AND `contact`.`rel` != ?
WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed`";
$parameters = [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Contact::FOLLOWER];
// Only poll from those with suitable relationships,
// and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
if ($abandon_days < 1) {
$abandon_days = 0;
}
if (!empty($abandon_days)) {
$sql .= " AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL ? DAY";
$parameters[] = $abandon_days;
}
$contacts = DBA::p($sql, $parameters);
if (!DBA::isResult($contacts)) {
return;
}
foreach ($contacts as $contact) {
if ($manual_id) {
$contact['last-update'] = DBA::NULL_DATETIME;
}
while ($contact = DBA::fetch($contacts)) {
// Friendica and OStatus are checked once a day
if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
$contact['priority'] = 2;
}
if ($contact['subhub'] && in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
/*
* We should be getting everything via a hub. But just to be sure, let's check once a day.
* (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
* This also lets us update our subscription to the hub, and add or replace hubs in case it
* changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
*/
$poll_interval = Config::get('system', 'pushpoll_frequency');
$contact['priority'] = (!is_null($poll_interval) ? intval($poll_interval) : 3);
}
// Check ActivityPub and Diaspora contacts or followers once a week
if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DIASPORA]) || ($contact["rel"] == Contact::FOLLOWER)) {
$contact['priority'] = 4;
$contact['priority'] = 3;
}
// Check archived contacts once a month
@ -224,7 +199,7 @@ class Cron
$contact['priority'] = 5;
}
if (($contact['priority'] >= 0) && !$force) {
if ($contact['priority'] >= 0) {
$update = false;
$t = $contact['last-update'];
@ -260,7 +235,7 @@ class Cron
break;
case 0:
default:
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + ".$min_poll_interval." minute")) {
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + " . $min_poll_interval . " minute")) {
$update = true;
}
break;
@ -282,5 +257,6 @@ class Cron
Worker::add(['priority' => $priority, 'dont_fork' => true, 'force_priority' => true], 'OnePoll', (int)$contact['id']);
}
DBA::close($contacts);
}
}

976
src/Worker/OnePoll.php
View file

File diff suppressed because it is too large Load diff

14
src/Worker/UpdateContact.php
View file

@ -13,16 +13,12 @@ use Friendica\Database\DBA;
class UpdateContact
{
public static function execute($contact_id)
public static function execute($contact_id, $command = '')
{
$success = Contact::updateFromProbe($contact_id);
// Update the "updated" field if the contact could be probed.
// We don't do this in the function above, since we don't want to
// update the contact whenever that function is called from anywhere.
if ($success) {
DBA::update('contact', ['updated' => DateTimeFormat::utcNow()], ['id' => $contact_id]);
}
$force = ($command == "force");
Logger::info('Updated from probe', ['id' => $contact_id, 'success' => $success]);
$success = Contact::updateFromProbe($contact_id, '', $force);
Logger::info('Updated from probe', ['id' => $contact_id, 'force' => $force, 'success' => $success]);
}
}