MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4004 from annando/vitality-check

Browse source 
Improved vitality check for followers, feeds and OStatus contacts
This commit is contained in:
Hypolite Petovan 2017-12-04 02:45:45 -05:00 committed by GitHub
parent f41c891a6b ad8c290c2b
commit 370cf6bd91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Worker/Cron.php
View file

@ -157,13 +157,11 @@ Class Cron {
`contact`.`last-update`, `contact`.`priority`, `contact`.`subhub` `contact`.`last-update`, `contact`.`priority`, `contact`.`subhub`
FROM `user` FROM `user`
STRAIGHT_JOIN `contact` STRAIGHT_JOIN `contact`
ON `contact`.`uid` = `user`.`uid` AND `contact`.`rel` IN (%d, %d) AND `contact`.`poll` != '' ON `contact`.`uid` = `user`.`uid` AND `contact`.`poll` != ''
AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra
AND NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly`
AND NOT `contact`.`archive` AND NOT `contact`.`archive`
WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql", WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),

35
src/Worker/OnePoll.php
View file

@ -42,30 +42,12 @@ Class OnePoll
$d = datetime_convert(); $d = datetime_convert();
// Only poll from those with suitable relationships, $contact = dba::select('contact', [], ['id' => $contact_id], ['limit' => 1]);
// and which have a polling address and ignore Diaspora since if (!DBM::is_result($contact)) {
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
$contacts = q("SELECT `contact`.* FROM `contact`
WHERE (`rel` = %d OR `rel` = %d) AND `poll` != ''
AND NOT `network` IN ('%s', '%s')
AND `contact`.`id` = %d
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 LIMIT 1",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_FACEBOOK),
dbesc(NETWORK_PUMPIO),
intval($contact_id)
);
if (!count($contacts)) {
logger('Contact not found or cannot be used.'); logger('Contact not found or cannot be used.');
return; return;
} }
$contact = $contacts[0];
$importer_uid = $contact['uid']; $importer_uid = $contact['uid'];
// load current friends if possible. // load current friends if possible.
@ -81,14 +63,13 @@ Class OnePoll
} }
} }
/// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?) // Diaspora users and followers we only check if they still exist.
/// @TODO Check whether this is possible with Redmatrix if (($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
if ($contact["network"] == NETWORK_DIASPORA) {
if (PortableContact::updateNeeded($contact["created"], $contact["last-item"], $contact["failure_update"], $contact["success_update"])) { if (PortableContact::updateNeeded($contact["created"], $contact["last-item"], $contact["failure_update"], $contact["success_update"])) {
$last_updated = PortableContact::lastUpdated($contact["url"]); $last_updated = PortableContact::lastUpdated($contact["url"]);
$updated = datetime_convert(); $updated = datetime_convert();
if ($last_updated) { if ($last_updated) {
logger('Diaspora contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG); logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG);
// The last public item can be older than the last item we got // The last public item can be older than the last item we got
if ($last_updated < $contact['last-item']) { if ($last_updated < $contact['last-item']) {
@ -101,7 +82,7 @@ Class OnePoll
} else { } else {
dba::update('contact', array('last-update' => $updated, 'failure_update' => $updated), array('id' => $contact['id'])); dba::update('contact', array('last-update' => $updated, 'failure_update' => $updated), array('id' => $contact['id']));
Contact::markForArchival($contact); Contact::markForArchival($contact);
logger('Diaspora contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG); logger('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG);
} }
} }
return; return;
@ -334,6 +315,7 @@ Class OnePoll
$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-'); $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
$ret = z_fetch_url($contact['poll'], false, $redirects, array('cookiejar' => $cookiejar)); $ret = z_fetch_url($contact['poll'], false, $redirects, array('cookiejar' => $cookiejar));
unlink($cookiejar);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
@ -344,7 +326,6 @@ Class OnePoll
$xml = $ret['body']; $xml = $ret['body'];
unlink($cookiejar);
} elseif ($contact['network'] === NETWORK_MAIL) { } elseif ($contact['network'] === NETWORK_MAIL) {
logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG); logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG);
@ -643,11 +624,13 @@ Class OnePoll
dba::update('contact', array('last-update' => $updated, 'success_update' => $updated), array('id' => $contact['id'])); dba::update('contact', array('last-update' => $updated, 'success_update' => $updated), array('id' => $contact['id']));
dba::update('gcontact', array('last_contact' => $updated), array('nurl' => $contact['nurl'])); dba::update('gcontact', array('last_contact' => $updated), array('nurl' => $contact['nurl']));
Contact::unmarkForArchival($contact);
} elseif (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED))) { } elseif (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED))) {
$updated = datetime_convert(); $updated = datetime_convert();
dba::update('contact', array('last-update' => $updated, 'failure_update' => $updated), array('id' => $contact['id'])); dba::update('contact', array('last-update' => $updated, 'failure_update' => $updated), array('id' => $contact['id']));
dba::update('gcontact', array('last_failure' => $updated), array('nurl' => $contact['nurl'])); dba::update('gcontact', array('last_failure' => $updated), array('nurl' => $contact['nurl']));
Contact::markForArchival($contact);
} else { } else {
dba::update('contact', array('last-update' => $updated), array('id' => $contact['id'])); dba::update('contact', array('last-update' => $updated), array('id' => $contact['id']));
} }