Merge pull request #12946 from friendica/api-permission

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

diff --git a/src/Module/ActivityPub/Inbox.php b/src/Module/ActivityPub/Inbox.php
index 4470040a9018ad4279323135c4419bcb22463d5e..77085c119a346ff116209ef8c027f22764608db6 100644 (file)
--- a/src/Module/ActivityPub/Inbox.php
+++ b/src/Module/ActivityPub/Inbox.php
@@ -27,15 +27,22 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Module\BaseApi;
+use Friendica\Module\Special\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * ActivityPub Inbox
  */
 class Inbox extends BaseApi
 {
+       public function run(HTTPException $httpException, array $request = [], bool $scopecheck = true): ResponseInterface
+       {
+               return parent::run($httpException, $request, false);
+       }
+
        protected function rawContent(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_READ);
@@ -54,12 +61,12 @@ class Inbox extends BaseApi
                        if ($owner['uid'] != $uid) {
                                throw new \Friendica\Network\HTTPException\ForbiddenException();
                        }
-                       $outbox = ActivityPub\Transmitter::getInbox($uid, $page, $request['max_id'] ?? null);
+                       $inbox = ActivityPub\ClientToServer::getInbox($uid, $page, $request['max_id'] ?? null);
                } else {
-                       $outbox = ActivityPub\Transmitter::getPublicInbox($uid, $page, $request['max_id'] ?? null);
+                       $inbox = ActivityPub\ClientToServer::getPublicInbox($uid, $page, $request['max_id'] ?? null);
                }
 
-               System::jsonExit($outbox, 'application/activity+json');
+               System::jsonExit($inbox, 'application/activity+json');
        }
 
        protected function post(array $request = [])