Changes:

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

diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php
index 5cd250777774baa7ce5fb24a18d071a191c43b6a..165d918c66a5ef94d89b35f352dfad1855c1828a 100644 (file)
--- a/src/Module/ActivityPub/Outbox.php
+++ b/src/Module/ActivityPub/Outbox.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,6 @@
 
 namespace Friendica\Module\ActivityPub;
 
-use Friendica\Core\System;
 use Friendica\Model\User;
 use Friendica\Module\BaseApi;
 use Friendica\Protocol\ActivityPub;
@@ -36,7 +35,7 @@ class Outbox extends BaseApi
        protected function rawContent(array $request = [])
        {
                if (empty($this->parameters['nickname'])) {
-                       throw new \Friendica\Network\HTTPException\NotFoundException();
+                       $this->jsonExit([], 'application/activity+json');
                }
 
                $owner = User::getOwnerDataByNick($this->parameters['nickname']);
@@ -51,15 +50,14 @@ class Outbox extends BaseApi
                        $page = 1;
                }
 
-               $requester = HTTPSignature::getSigner('', $_SERVER);
-               $outbox = ActivityPub\Transmitter::getOutbox($owner, $uid, $page, $request['max_id'] ?? null, $requester);
+               $outbox = ActivityPub\ClientToServer::getOutbox($owner, $uid, $page, $request['max_id'] ?? null, HTTPSignature::getSigner('', $_SERVER));
 
-               System::jsonExit($outbox, 'application/activity+json');
+               $this->jsonExit($outbox, 'application/activity+json');
        }
 
        protected function post(array $request = [])
        {
-               self::checkAllowedScope(self::SCOPE_WRITE);
+               $this->checkAllowedScope(self::SCOPE_WRITE);
                $uid      = self::getCurrentUserID();
                $postdata = Network::postdata();
 
@@ -80,6 +78,6 @@ class Outbox extends BaseApi
                        throw new \Friendica\Network\HTTPException\BadRequestException();
                }
 
-               ActivityPub\Receiver::processC2SActivity($activity, $uid, self::getCurrentApplication() ?? []);
+               $this->jsonExit(ActivityPub\ClientToServer::processActivity($activity, $uid, self::getCurrentApplication() ?? []));
        }
 }