clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove parameter-less call of OStatus\Salmon module in DFRN\Notify 

- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1342615279
This commit is contained in:
Hypolite Petovan 2022-12-08 09:45:33 -05:00
parent a71fb8d7f3
commit 71a7f2d503
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Module/DFRN/Notify.php
View File

@ -70,18 +70,8 @@ class Notify extends BaseModule
throw new \Friendica\Network\HTTPException\InternalServerErrorException();
}
$this->dispatchPrivate($user, $postdata);
} elseif (!$this->dispatchPublic($postdata)) {
(new Salmon(
$this->database,
$this->l10n,
$this->baseUrl,
$this->args,
$this->logger,
$this->profiler,
$this->response,
$this->server,
$this->parameters
))->rawContent($request);
} else {
$this->dispatchPublic($postdata);
}
}

9
src/Module/OStatus/Salmon.php
View File

@ -66,11 +66,12 @@ class Salmon extends \Friendica\BaseModule
{
$xml = Network::postdata();
$this->logger->debug('New Salmon', ['nickname' => $this->parameters['nickname'], 'xml' => $xml]);
// Despite having a route with a mandatory nickname parameter, this method can also be called from
// \Friendica\Module\DFRN\Notify->post where the same parameter is optional 🤷‍
$nickname = $this->parameters['nickname'] ?? '';
if (empty($nickname)) {
throw new HTTPException\BadRequestException('nickname parameter is mandatory');
}
$this->logger->debug('New Salmon', ['nickname' => $nickname, 'xml' => $xml]);
$importer = $this->database->selectFirst('user', [], ['nickname' => $nickname, 'account_expired' => false, 'account_removed' => false]);
if (!$this->database->isResult($importer)) {