eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

More Exceptions for FeedSub doSubscribe and related functions

Browse Source 
Now also garbageCollect will now throw exceptions of failures of all kinds
and only reply true/false on entirely successful runs of sub/unsub.
This commit is contained in:
Mikael Nordfeldth
2014-05-06 15:40:57 +02:00
parent 0fa00d5106
commit c279a33feb
7 changed files with 72 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/OStatus/scripts/resub-feed.php
View File

@@ -53,20 +53,18 @@ if (!$sub) {
print "Old state:\n";
showSub($sub);
print "\n";
if (have_option('u') || have_option('--unsub')) {
print "Pinging hub $sub->huburi with unsubscription for $sub->uri\n";
$ok = $sub->unsubscribe();
} else {
print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
$ok = $sub->subscribe();
}
if ($ok) {
print "ok\n";
} else {
print "Could not confirm.\n";
try {
echo "\n";
if (have_option('u') || have_option('--unsub')) {
echo "Pinging hub {$sub->huburi} with unsubscription for {$sub->uri}\n";
$sub->unsubscribe();
} else {
echo "Pinging hub {$sub->huburi} with new subscription for {$sub->uri}\n";
$sub->subscribe();
}
echo "ok\n";
} catch (Exception $e) {
echo 'Could not confirm. '.get_class($e).': '.$e->getMessage()."\n";
}
$sub2 = FeedSub::getKV('uri', $feedurl);