Onepoll: mark the last request failure for this contact

This commit is contained in:
Michael Vogel 2015-07-17 23:05:50 +02:00
parent 09d71abbfc
commit 639f94f8b9
3 changed files with 89 additions and 34 deletions

View file

@ -451,6 +451,7 @@ function db_definition() {
"hub-verify" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "hub-verify" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"last-update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "last-update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"success_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "success_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"failure_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"name-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "name-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"uri-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "uri-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"avatar-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "avatar-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),

View file

@ -79,28 +79,69 @@ function onepoll_run(&$argv, &$argc){
$contacts = q("SELECT `contact`.* FROM `contact` $contacts = q("SELECT `contact`.* FROM `contact`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
AND NOT `network` IN ( '%s', '%s', '%s' ) AND NOT `network` IN ( '%s', '%s' )
AND `contact`.`id` = %d AND `contact`.`id` = %d
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 LIMIT 1", AND `contact`.`archive` = 0 LIMIT 1",
intval(CONTACT_IS_SHARING), intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND), intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_FACEBOOK), dbesc(NETWORK_FACEBOOK),
dbesc(NETWORK_PUMPIO), dbesc(NETWORK_PUMPIO),
intval($contact_id) intval($contact_id)
); );
if(! count($contacts)) { if(! count($contacts))
// Maybe it is a Redmatrix account. Then we can fetch their contacts via poco
$contacts = q("SELECT `id`, `poco` FROM `contact` WHERE `id` = %d AND `poco` != ''", intval($contact_id));
if ($contacts)
poco_load($contacts[0]['id'],$importer_uid,0,$contacts[0]['poco']);
return; return;
}
$contact = $contacts[0]; $contact = $contacts[0];
// load current friends if possible.
if (($contact['poco'] != "") AND ($contact['success_update'] > $contact['failure_update'])) {
$r = q("SELECT count(*) as total from glink
where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
intval($contact['id'])
);
if (count($r))
if (!$r[0]['total'])
poco_load($contact['id'],$importer_uid,0,$contact['poco']);
}
// To-Do:
// - Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
// - Check whether this is possible with Redmatrix
if ($contact["network"] == NETWORK_DIASPORA) {
if (poco_do_update($contact["last-item"], $contact["success_update"], $contact["failure_update"])) {
$last_updated = poco_last_updated($contact["url"]);
$updated = datetime_convert();
if ($last_updated) {
q("UPDATE `contact` SET `last-item` = '%s', `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d",
dbesc($last_updated),
dbesc($updated),
dbesc($updated),
intval($contact['id'])
);
q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
dbesc($last_updated),
dbesc($updated),
dbesc($contact['nurl'])
);
} else {
q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
dbesc($updated),
dbesc($updated),
intval($contact['id'])
);
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
dbesc($updated),
dbesc($contact['nurl'])
);
}
}
return;
}
$xml = false; $xml = false;
$t = $contact['last-update']; $t = $contact['last-update'];
@ -177,7 +218,8 @@ function onepoll_run(&$argv, &$argc){
mark_for_death($contact); mark_for_death($contact);
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($contact['id']) intval($contact['id'])
); );
@ -190,7 +232,8 @@ function onepoll_run(&$argv, &$argc){
mark_for_death($contact); mark_for_death($contact);
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($contact['id']) intval($contact['id'])
); );
@ -207,7 +250,8 @@ function onepoll_run(&$argv, &$argc){
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($contact['id']) intval($contact['id'])
); );
@ -554,14 +598,14 @@ function onepoll_run(&$argv, &$argc){
logger('poller: received xml : ' . $xml, LOGGER_DATA); logger('poller: received xml : ' . $xml, LOGGER_DATA);
if(! strstr($xml,'<')) { if(! strstr($xml,'<')) {
logger('poller: post_handshake: response from ' . $url . ' did not contain XML.'); logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($contact['id']) intval($contact['id'])
); );
return; return;
} }
consume_feed($xml,$importer,$contact,$hub,1,1); consume_feed($xml,$importer,$contact,$hub,1,1);
@ -588,7 +632,6 @@ function onepoll_run(&$argv, &$argc){
} }
} }
} }
}
$updated = datetime_convert(); $updated = datetime_convert();
@ -598,19 +641,29 @@ function onepoll_run(&$argv, &$argc){
intval($contact['id']) intval($contact['id'])
); );
q("UPDATE `gcontact` SET `last_contact` = '%s' WHERE `nurl` = '%s'",
dbesc($updated),
dbesc($contact['nurl'])
);
// load current friends if possible. } elseif (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED))) {
$updated = datetime_convert();
if($contact['poco']) { $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
$r = q("SELECT count(*) as total from glink dbesc($updated),
where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", dbesc($updated),
intval($contact['id'])
);
q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
dbesc($updated),
dbesc($contact['nurl'])
);
} else {
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
dbesc($updated),
intval($contact['id']) intval($contact['id'])
); );
}
if(count($r)) {
if(! $r[0]['total']) {
poco_load($contact['id'],$importer_uid,0,$contact['poco']);
}
} }
return; return;

View file

@ -1,12 +1,15 @@
<?php <?php
require_once('include/datetime.php'); require_once('include/datetime.php');
require_once("include/Scrape.php");
/* /*
To-Do: To-Do:
- noscrape for updating contact fields and "last updated" - noscrape for updating contact fields and "last updated"
- use /poco/@global for discovering contacts from other servers - use /poco/@global for discovering contacts from other servers
- Make search for last activity optional - Make search for last activity optional
- only export contacts via poco where update is higher than failure
- check your own contacts in some way as well
*/ */
/* /*
@ -220,8 +223,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
} }
if (($network == "") OR ($name == "") OR ($profile_photo == "")) { if (($network == "") OR ($name == "") OR ($profile_photo == "")) {
require_once("include/Scrape.php");
$data = probe_url($profile_url); $data = probe_url($profile_url);
$network = $data["network"]; $network = $data["network"];
$name = $data["name"]; $name = $data["name"];