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

Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Brion Vibber
2010-03-18 10:55:20 -07:00
parent ca5612c451 515cdf28a8
commit 1de7badd78
4 changed files with 92 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/OStatus/scripts/updateostatus.php
View File

@@ -56,7 +56,12 @@ try {
$user = new User();
if ($user->find()) {
while ($user->fetch()) {
updateOStatus($user);
try {
updateOStatus($user);
} catch (Exception $e) {
common_log(LOG_NOTICE, "Couldn't convert OMB subscriptions ".
"for {$user->nickname} to OStatus: " . $e->getMessage());
}
}
}
} else {
@@ -107,8 +112,8 @@ function updateOStatus($user)
if (!have_option('q', 'quiet')) {
echo "Converting...";
}
Subscription::cancel($up, $rp);
Subscription::start($up, $op->localProfile());
Subscription::cancel($up, $rp);
if (!have_option('q', 'quiet')) {
echo "done.\n";
}
@@ -118,8 +123,7 @@ function updateOStatus($user)
if (!have_option('q', 'quiet')) {
echo "fail.\n";
}
continue;
common_log(LOG_WARNING, "Couldn't convert OMB subscription (" . $up->nickname . ", " . $rp->nickname .
common_log(LOG_NOTICE, "Couldn't convert OMB subscription (" . $up->nickname . ", " . $rp->nickname .
") to OStatus: " . $e->getMessage());
continue;
}