Changes:

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

diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php
index 4bc1ca69301d27aa27b7789d39add7138f953316..165d918c66a5ef94d89b35f352dfad1855c1828a 100644 (file)
--- a/src/Module/ActivityPub/Outbox.php
+++ b/src/Module/ActivityPub/Outbox.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,21 +21,21 @@
 
 namespace Friendica\Module\ActivityPub;
 
-use Friendica\BaseModule;
-use Friendica\Core\System;
 use Friendica\Model\User;
+use Friendica\Module\BaseApi;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
+use Friendica\Util\Network;
 
 /**
  * ActivityPub Outbox
  */
-class Outbox extends BaseModule
+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']);
@@ -43,11 +43,41 @@ class Outbox extends BaseModule
                        throw new \Friendica\Network\HTTPException\NotFoundException();
                }
 
-               $page = $_REQUEST['page'] ?? null;
+               $uid  = self::getCurrentUserID();
+               $page = $request['page'] ?? null;
+
+               if (empty($page) && empty($request['max_id']) && !empty($uid)) {
+                       $page = 1;
+               }
 
-               $requester = HTTPSignature::getSigner('', $_SERVER);
-               $outbox = ActivityPub\Transmitter::getOutbox($owner, $page, $requester);
+               $outbox = ActivityPub\ClientToServer::getOutbox($owner, $uid, $page, $request['max_id'] ?? null, HTTPSignature::getSigner('', $_SERVER));
+
+               $this->jsonExit($outbox, 'application/activity+json');
+       }
+
+       protected function post(array $request = [])
+       {
+               $this->checkAllowedScope(self::SCOPE_WRITE);
+               $uid      = self::getCurrentUserID();
+               $postdata = Network::postdata();
+
+               if (empty($postdata) || empty($this->parameters['nickname'])) {
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
+               }
+
+               $owner = User::getOwnerDataByNick($this->parameters['nickname']);
+               if (empty($owner)) {
+                       throw new \Friendica\Network\HTTPException\NotFoundException();
+               }
+               if ($owner['uid'] != $uid) {
+                       throw new \Friendica\Network\HTTPException\ForbiddenException();
+               }
+
+               $activity = json_decode($postdata, true);
+               if (empty($activity)) {
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
+               }
 
-               System::jsonExit($outbox, 'application/activity+json');
+               $this->jsonExit(ActivityPub\ClientToServer::processActivity($activity, $uid, self::getCurrentApplication() ?? []));
        }
 }