X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInbox.php;h=2cc273b139910c647a141b42bcf484fcdcd58fee;hb=3940e804e3ee4ac921e109f62a73fac2becaa611;hp=8842c66bcb67f82db1137c7e2b1479ca52dcaeb0;hpb=004818ca1b37dac574eed7d528f02219b7394c29;p=friendica.git diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php index 8842c66bcb..2cc273b139 100644 --- a/src/Module/Inbox.php +++ b/src/Module/Inbox.php @@ -6,10 +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\Util\Network; /** * ActivityPub Inbox @@ -20,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')) { @@ -37,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 { @@ -49,6 +53,6 @@ class Inbox extends BaseModule ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid); - System::httpExit(202); + throw new \Friendica\Network\HTTPException\AcceptedException(); } }