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)) {
intval($uid)
);
}
-
} else {
// 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
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'])
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;
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
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);
/*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
"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];
--- /dev/null
+<?php
+
+require_once('include/Scrape.php');
+require_once('include/follow.php');
+
+function repair_ostatus_content(&$a) {
+
+ if(! local_user()) {
+ notice( t('Permission denied.') . EOL);
+ goaway($_SESSION['return_url']);
+ // NOTREACHED
+ }
+
+ $o = "<h2>".t("Resubsribing to OStatus contacts")."</h2>";
+
+ $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 .= "<p>".$counter."/".$total.": ".$r[0]["url"]."</p>";
+
+ $o .= "<p>".t("Keep this window open until done.")."</p>";
+
+ $result = new_contact($uid,$r[0]["url"],true);
+
+ $a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.$a->get_baseurl().'/repair_ostatus?counter='.$counter.'">';
+
+ return $o;
+}