wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diaspora doesn't understand our Salmon POST, so send again

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-06-06 16:57:29 +02:00
parent b63054cb1d
commit faf14197cd
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/OStatus/lib/salmon.php
View File

@ -71,7 +71,19 @@ class Salmon
common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage()); common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage());
return false; return false;
} }
if ($response->getStatus() != 200) {
// Diaspora wants a slightly different formatting on the POST (other Content-type, so body needs "xml=")
if ($response->getStatus() === 422) {
common_debug(sprintf('Salmon (from profile %d) endpoint %s returned status %s. Diaspora? Will try again! Body: %s',
$user->id, $endpoint_uri, $response->getStatus(), $response->getBody()));
$headers = array('Content-Type: application/x-www-form-urlencoded');
$client->setBody('xml=' . Magicsig::base64_url_encode($envxml));
$response = $client->post($endpoint_uri, $headers);
}
// 200 OK is the best response
// 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', common_log(LOG_ERR, sprintf('Salmon (from profile %d) endpoint %s returned status %s: %s',
$user->id, $endpoint_uri, $response->getStatus(), $response->getBody())); $user->id, $endpoint_uri, $response->getStatus(), $response->getBody()));
return false; return false;