From fd239ebf7bebe8cee9c4f58a4b8b48c953c426ef Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 3 Sep 2015 22:18:25 +0200 Subject: [PATCH] Try to repair OStatus subscriptions --- include/follow.php | 8 ++++-- include/items.php | 2 +- include/onepoll.php | 12 ++++++++- mod/contacts.php | 34 ++++++++++++++++++++++--- mod/repair_ostatus.php | 57 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 106 insertions(+), 7 deletions(-) create mode 100755 mod/repair_ostatus.php diff --git a/include/follow.php b/include/follow.php index 10ce4f6673..217b9d07b7 100644 --- a/include/follow.php +++ b/include/follow.php @@ -170,6 +170,11 @@ function new_contact($uid,$url,$interactive = false) { dbesc($ret['network']) ); + if(!count($r)) + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1", + intval($uid), dbesc(normalise_link($url)), dbesc($ret['network']) + ); + if(count($r)) { // update contact if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) { @@ -180,7 +185,6 @@ function new_contact($uid,$url,$interactive = false) { intval($uid) ); } - } else { @@ -285,7 +289,7 @@ function new_contact($uid,$url,$interactive = false) { // pull feed and consume it, which should subscribe to the hub. - proc_run('php',"include/poller.php","$contact_id"); + proc_run('php',"include/onepoll.php","$contact_id", "force"); // create a follow slap diff --git a/include/items.php b/include/items.php index cc03a77646..5915e2ecee 100644 --- a/include/items.php +++ b/include/items.php @@ -4300,7 +4300,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token); - if(! strlen($contact['hub-verify'])) { + if(!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) { $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d", dbesc($verify_token), intval($contact['id']) diff --git a/include/onepoll.php b/include/onepoll.php index 90d018524d..1fc861afa2 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -53,6 +53,9 @@ function onepoll_run(&$argv, &$argc){ if(($argc > 1) && (intval($argv[1]))) $contact_id = intval($argv[1]); + if(($argc > 2) && ($argv[2] == "force")) + $force = true; + if(! $contact_id) { logger('onepoll: no contact'); return; @@ -595,8 +598,10 @@ function onepoll_run(&$argv, &$argc){ return; } - consume_feed($xml,$importer,$contact,$hub,1,1); + logger("Consume feed of contact ".$contact['id']); + + consume_feed($xml,$importer,$contact,$hub,1,1); // do it twice. Ensures that children of parents which may be later in the stream aren't tossed @@ -609,6 +614,11 @@ function onepoll_run(&$argv, &$argc){ if(($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) $hub_update = true; + if ($force) + $hub_update = true; + + logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update); + if((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) { logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']); $hubs = explode(',', $hub); diff --git a/mod/contacts.php b/mod/contacts.php index 826630d305..89154eded9 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -206,15 +206,36 @@ function contacts_post(&$a) { /*contact actions*/ function _contact_update($contact_id) { - // pull feed and consume it, which should subscribe to the hub. - proc_run('php',"include/poller.php","$contact_id"); + $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); + if (!$r) + return; + + $uid = $r[0]["uid"]; + + if ($uid != local_user()) + return; + + if ($r[0]["network"] == NETWORK_OSTATUS) { + $result = new_contact($uid, $r[0]["url"], false); + + if ($result['success']) + $r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", + intval($contact_id)); + } else + // pull feed and consume it, which should subscribe to the hub. + proc_run('php',"include/onepoll.php","$contact_id", "force"); } function _contact_update_profile($contact_id) { - $r = q("SELECT `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); + $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); if (!$r) return; + $uid = $r[0]["uid"]; + + if ($uid != local_user()) + return; + $data = probe_url($r[0]["url"]); // "Feed" is mostly a sign of communication problems @@ -225,6 +246,13 @@ function _contact_update_profile($contact_id) { "poco", "network", "alias", "pubkey"); $update = array(); + if ($data["network"] == NETWORK_OSTATUS) { + $result = new_contact($uid, $data["url"], false); + + if ($result['success']) + $update["subhub"] = true; + } + foreach($updatefields AS $field) if (isset($data[$field]) AND ($data[$field] != "")) $update[$field] = $data[$field]; diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php new file mode 100755 index 0000000000..5a8554dff8 --- /dev/null +++ b/mod/repair_ostatus.php @@ -0,0 +1,57 @@ +".t("Resubsribing to OStatus contacts").""; + + $uid = local_user(); + + $a = get_app(); + + $counter = intval($_REQUEST['counter']); + + $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE + `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)", + intval($uid), + dbesc(NETWORK_OSTATUS), + intval(CONTACT_IS_FRIEND), + intval(CONTACT_IS_SHARING)); + + if (!$r) + return($o.t("Error")); + + $total = $r[0]["total"]; + + $r = q("SELECT `url` FROM `contact` WHERE + `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d) + ORDER BY `url` + LIMIT %d, 1", + intval($uid), + dbesc(NETWORK_OSTATUS), + intval(CONTACT_IS_FRIEND), + intval(CONTACT_IS_SHARING), ++$counter); + + if (!$r) { + $o .= t("Done"); + return $o; + } + + $o .= "

".$counter."/".$total.": ".$r[0]["url"]."

"; + + $o .= "

".t("Keep this window open until done.")."

"; + + $result = new_contact($uid,$r[0]["url"],true); + + $a->page['htmlhead'] = ''; + + return $o; +} -- 2.39.5