Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 11:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into collapse

Browse source
This commit is contained in:
Michael 2023-01-08 17:47:21 +00:00
commit 50746bad55
11 changed files with 88 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Api/ApiResponse.php
View file

@ -276,9 +276,8 @@ class ApiResponse extends Response
'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
'request' => $request,
]);
$error = $this->l10n->t('API endpoint %s %s is not implemented', strtoupper($method), $path);
$error_description = $this->l10n->t('The API endpoint is currently not implemented but might be in the future.');
$error = $this->l10n->t('API endpoint %s %s is not implemented but might be in the future.', strtoupper($method), $path);
$this->exit('error', ['error' => ['error' => $error, 'error_description' => $error_description]]);
$this->error(501, 'Not Implemented', $error);
}
}

2
src/Module/OStatus/PubSub.php
View file

@ -58,7 +58,7 @@ class PubSub extends \Friendica\BaseModule
$this->logger->info('Feed arrived.', ['from' => $this->request->getRemoteAddress(), 'for' => $this->args->getCommand(), 'user-agent' => $this->server['HTTP_USER_AGENT']]);
$this->logger->debug('Data stream.', ['xml' => $xml]);
$this->logger->debug('Gut request data.', ['request' => $request]);
$this->logger->debug('Got request data.', ['request' => $request]);
$nickname = $this->parameters['nickname'] ?? '';
$contact_id = $this->parameters['cid'] ?? 0;

2
src/Module/OStatus/PubSubHubBub.php
View file

@ -71,7 +71,7 @@ class PubSubHubBub extends \Friendica\BaseModule
throw new HTTPException\ForbiddenException();
}
$this->logger->debug('Gut request data.', ['request' => $request]);
$this->logger->debug('Got request data.', ['request' => $request]);
// Subscription request from subscriber
// https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html#rfc.section.5.1

2
src/Module/OStatus/Salmon.php
View file

@ -65,7 +65,7 @@ class Salmon extends \Friendica\BaseModule
protected function post(array $request = [])
{
$xml = Network::postdata();
$this->logger->debug('Gut request data.', ['request' => $request]);
$this->logger->debug('Got request data.', ['request' => $request]);
$nickname = $this->parameters['nickname'] ?? '';
if (empty($nickname)) {