Try to repair OStatus subscriptions
This commit is contained in:
parent
ffc9f94149
commit
fd239ebf7b
5 changed files with 106 additions and 7 deletions
|
@ -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];
|
||||
|
|
57
mod/repair_ostatus.php
Executable file
57
mod/repair_ostatus.php
Executable file
|
@ -0,0 +1,57 @@
|
|||
<?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;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue