GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Message to end-user on why FeedSub failed.

This commit is contained in:
Mikael Nordfeldth 2017-05-01 07:40:16 +02:00
parent 5ac20a4d30
commit 37c97ac8fc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/OStatus/classes/FeedSub.php
View File

@ -393,6 +393,8 @@ class FeedSub extends Managed_DataObject
*/
protected function doSubscribe($mode)
{
$msg = null; // carries descriptive error message to enduser (no remote data strings!)
$orig = clone($this);
if ($mode == 'subscribe') {
$this->secret = common_random_hexstr(32);
@ -435,6 +437,7 @@ class FeedSub extends Managed_DataObject
return;
} else if ($status >= 200 && $status < 300) {
common_log(LOG_ERR, __METHOD__ . ": sub req returned unexpected HTTP $status: " . $response->getBody());
$msg = sprintf(_m("Unexpected HTTP status: %d"), $status);
} else if ($status == 422) {
// Error code regarding something wrong in the data (it seems
// that we're talking to a PuSH hub at least, so let's check
@ -455,7 +458,7 @@ class FeedSub extends Managed_DataObject
// Throw the Exception again.
throw $e;
}
throw new ServerException("{$mode} request failed.");
throw new ServerException("{$mode} request failed" . (!is_null($msg) ? " ($msg)" : '.'));
}
/**