Onepoll: mark the last request failure for this contact

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 8688903ba3c9c6f3551857d62b0273eaab531291..98e225bf8f420906a10713d5c96b8c6bb50dfa55 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -451,6 +451,7 @@ function db_definition() {
                                        "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"),
                                        "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"),
                                        "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"),

diff --git a/include/onepoll.php b/include/onepoll.php
index 9723fadd5135d6a04b1dca75f0838ff844ee6836..73668126a1b7c0a92ece2fd7a499381b7a3b5d6d 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -79,28 +79,69 @@ function onepoll_run(&$argv, &$argc){
 
        $contacts = q("SELECT `contact`.* FROM `contact`
                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 `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_DIASPORA),
                dbesc(NETWORK_FACEBOOK),
                dbesc(NETWORK_PUMPIO),
                intval($contact_id)
        );
 
-       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']);
+       if(! count($contacts))
                return;
-       }
 
        $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;
 
        $t = $contact['last-update'];
@@ -177,7 +218,8 @@ function onepoll_run(&$argv, &$argc){
                        mark_for_death($contact);
 
                        // 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()),
                                intval($contact['id'])
                        );
@@ -190,7 +232,8 @@ function onepoll_run(&$argv, &$argc){
 
                        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()),
                                intval($contact['id'])
                        );
@@ -207,7 +250,8 @@ function onepoll_run(&$argv, &$argc){
                        // 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()),
                                intval($contact['id'])
                        );
@@ -554,14 +598,14 @@ function onepoll_run(&$argv, &$argc){
                logger('poller: received xml : ' . $xml, LOGGER_DATA);
                if(! strstr($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()),
                                intval($contact['id'])
                        );
                        return;
                }
 
-
                consume_feed($xml,$importer,$contact,$hub,1,1);
 
 
@@ -588,29 +632,38 @@ function onepoll_run(&$argv, &$argc){
                                }
                        }
                }
-       }
 
-       $updated = datetime_convert();
+               $updated = datetime_convert();
 
-       $r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d",
-               dbesc($updated),
-               dbesc($updated),
-               intval($contact['id'])
-       );
+               $r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d",
+                       dbesc($updated),
+                       dbesc($updated),
+                       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("SELECT count(*) as total from glink
-                       where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
+               $r = 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'])
+               );
+       } else {
+               $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
+                       dbesc($updated),
                        intval($contact['id'])
                );
-       }
-       if(count($r)) {
-               if(! $r[0]['total']) {
-                       poco_load($contact['id'],$importer_uid,0,$contact['poco']);
-               }
        }
 
        return;

diff --git a/include/socgraph.php b/include/socgraph.php
index 3ff934f7243da748fb672eb20f4e44bd9a8e72ff..c676157eae9edfbdf6a0e779f906c7fae272e6b0 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -1,12 +1,15 @@
 <?php
 
 require_once('include/datetime.php');
+require_once("include/Scrape.php");
 
 /*
  To-Do:
  - noscrape for updating contact fields and "last updated"
  - use /poco/@global for discovering contacts from other servers
  - 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 == "")) {
-               require_once("include/Scrape.php");
-
                $data = probe_url($profile_url);
                $network = $data["network"];
                $name = $data["name"];