Group selection: Respect "pubmail" and ignore atchived or blocked contacts

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

diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 8842c66bcb67f82db1137c7e2b1479ca52dcaeb0..8ab169567e021087782b2655935b53f9f0f2de42 100644 (file)
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -6,24 +6,27 @@
 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
  */
 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();
                }
 
                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();
        }
 }