X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInbox.php;h=2cc273b139910c647a141b42bcf484fcdcd58fee;hb=aca701bef8896a1d6b829f51deecd44d933e517f;hp=c075dd6a638888384ee9e18db7617de4b90ab27c;hpb=0fdab4ed10af43d25a8a4a8f1d7d0fd9f9d18eaa;p=friendica.git diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php index c075dd6a63..2cc273b139 100644 --- a/src/Module/Inbox.php +++ b/src/Module/Inbox.php @@ -6,11 +6,13 @@ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Protocol\ActivityPub; +use Friendica\Core\Config; +use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\Protocol\ActivityPub; use Friendica\Util\HTTPSignature; -use Friendica\Core\Config; +use Friendica\Util\Network; /** * ActivityPub Inbox @@ -21,10 +23,10 @@ class Inbox extends BaseModule { $a = self::getApp(); - $postdata = file_get_contents('php://input'); + $postdata = Network::postdata(); if (empty($postdata)) { - System::httpExit(400); + throw new \Friendica\Network\HTTPException\BadRequestException(); } if (Config::get('debug', 'ap_inbox_log')) { @@ -38,10 +40,11 @@ class Inbox extends BaseModule Logger::log('Incoming message stored under ' . $tempfile); } + // @TODO: Replace with parameter from router if (!empty($a->argv[1])) { $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]); if (!DBA::isResult($user)) { - System::httpExit(404); + throw new \Friendica\Network\HTTPException\NotFoundException(); } $uid = $user['uid']; } else { @@ -50,6 +53,6 @@ class Inbox extends BaseModule ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid); - System::httpExit(202); + throw new \Friendica\Network\HTTPException\AcceptedException(); } }