Update doignore() in main.js to match new Item\Ignore return type

[friendica.git] / src / Module / Inbox.php

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 692e4043adce99f6fec85c4326a6b9ead51404cb..8ab169567e021087782b2655935b53f9f0f2de42 100644 (file)
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -2,47 +2,49 @@
 /**
  * @file src/Module/Inbox.php
  */
+
 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\Logger;
+use Friendica\Util\Network;
 
 /**
  * ActivityPub Inbox
  */
 class Inbox extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
                $a = self::getApp();
 
-               $postdata = file_get_contents('php://input');
+               $postdata = Network::postdata();
 
                if (empty($postdata)) {
-                       System::httpExit(400);
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
                }
 
-// Enable for test purposes
-/*
-               if (HTTPSignature::getSigner($postdata, $_SERVER)) {
-                       $filename = 'signed-activitypub';
-               } else {
-                       $filename = 'failed-activitypub';
+               if (Config::get('debug', 'ap_inbox_log')) {
+                       if (HTTPSignature::getSigner($postdata, $_SERVER)) {
+                               $filename = 'signed-activitypub';
+                       } else {
+                               $filename = 'failed-activitypub';
+                       }
+                       $tempfile = tempnam(get_temppath(), $filename);
+                       file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+                       Logger::log('Incoming message stored under ' . $tempfile);
                }
 
-               $tempfile = tempnam(get_temppath(), $filename);
-               file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-
-               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 {
@@ -51,6 +53,6 @@ class Inbox extends BaseModule
 
                ActivityPub\Receiver::processInbox($postdata, $_SERVER, $uid);
 
-               System::httpExit(202);
+               throw new \Friendica\Network\HTTPException\AcceptedException();
        }
 }