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

Magic signature discovery and envelope changes

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-10-04 17:26:35 +02:00
parent 6afa091dca
commit af1b0915f4
3 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/OStatusPlugin.php
View File

@@ -1381,7 +1381,7 @@ class OStatusPlugin extends Plugin
return false;
}
if ($response->getStatus() === 422) {
common_debug(sprintf('Salmon (from profile %d) endpoint %s returned status %s. We assume it is a Diaspora seed, will adapt and try again if that plugin is enabled!'));
common_debug(sprintf('Salmon (from profile %d) endpoint %s returned status %s. We assume it is a Diaspora seed; will adapt and try again if that plugin is enabled!', $magic_env->getActor()->getID(), $endpoint_uri, $response->getStatus()));
return true;
}
@@ -1389,7 +1389,7 @@ class OStatusPlugin extends Plugin
// 202 Accepted is what we get from Diaspora for example
if (!in_array($response->getStatus(), array(200, 202))) {
common_log(LOG_ERR, sprintf('Salmon (from profile %d) endpoint %s returned status %s: %s',
$user->id, $endpoint_uri, $response->getStatus(), $response->getBody()));
$magic_env->getActor()->getID(), $endpoint_uri, $response->getStatus(), $response->getBody()));
return true;
}