Ensure to transmit the audience if the parent does so

[friendica.git] / src / Protocol / ActivityPub / ClientToServer.php

diff --git a/src/Protocol/ActivityPub/ClientToServer.php b/src/Protocol/ActivityPub/ClientToServer.php
index 17de28c51ab1aa0192e55c7b86258d96f659cf0f..2b52d17b767dc22ef39bf7519182aabfd1ff9f32 100644 (file)
--- a/src/Protocol/ActivityPub/ClientToServer.php
+++ b/src/Protocol/ActivityPub/ClientToServer.php
@@ -28,7 +28,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
@@ -208,7 +208,7 @@ class ClientToServer
 
                $targets = [];
 
-               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+               foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc', 'as:audience'] as $element) {
                        switch ($element) {
                                case 'as:to':
                                        $type = Receiver::TARGET_TO;
@@ -222,6 +222,9 @@ class ClientToServer
                                case 'as:bcc':
                                        $type = Receiver::TARGET_BCC;
                                        break;
+                               case 'as:audience':
+                                       $type = Receiver::TARGET_AUDIENCE;
+                                       break;
                        }
                        $receiver_list = JsonLD::fetchElementArray($object, $element, '@id');
                        if (empty($receiver_list)) {
@@ -264,7 +267,7 @@ class ClientToServer
                $item['contact-id'] = $owner['id'];
                $item['author-id']  = $item['owner-id']  = Contact::getPublicIdByUserId($uid);
                $item['title']      = $object_data['name'];
-               $item['body']       = Markdown::toBBCode($object_data['content']);
+               $item['body']       = Markdown::toBBCode($object_data['content'] ?? '');
                $item['app']        = $application['name'] ?? 'API';
 
                if (!empty($object_data['target'][Receiver::TARGET_GLOBAL])) {
@@ -281,7 +284,7 @@ class ClientToServer
                        $item['private']   = Item::UNLISTED;
                } elseif (!empty($object_data['target'][Receiver::TARGET_FOLLOWER])) {
                        $item['allow_cid'] = '';
-                       $item['allow_gid'] = '<' . Group::FOLLOWERS . '>';
+                       $item['allow_gid'] = '<' . Circle::FOLLOWERS . '>';
                        $item['deny_cid']  = '';
                        $item['deny_gid']  = '';
                        $item['private']   = Item::PRIVATE;
@@ -336,7 +339,7 @@ class ClientToServer
                                $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $owner['uid']);
                                if (!empty($permissionSets)) {
                                        $condition = ['psid' => array_merge($permissionSets->column('id'),
-                                                       [DI::permissionSet()->selectPublicForUser($owner['uid'])])];
+                                               [DI::permissionSet()->selectPublicForUser($owner['uid'])])];
                                }
                        }
                }
@@ -354,6 +357,10 @@ class ClientToServer
 
                $apcontact = APContact::getByURL($owner['url']);
 
+               if (empty($apcontact)) {
+                       throw new \Friendica\Network\HTTPException\NotFoundException();
+               }
+
                return self::getCollection($condition, DI::baseUrl() . '/outbox/' . $owner['nickname'], $page, $max_id, $uid, $apcontact['statuses_count']);
        }
 
@@ -361,15 +368,24 @@ class ClientToServer
        {
                $owner = User::getOwnerDataById($uid);
 
-               $condition = ['gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN], 'uid' => $uid];
+               $condition = [
+                       'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
+                       'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN],
+                       'uid'     => $uid
+               ];
 
                return self::getCollection($condition, DI::baseUrl() . '/inbox/' . $owner['nickname'], $page, $max_id, $uid, null);
        }
 
        public static function getPublicInbox(int $uid, int $page = null, int $max_id = null)
        {
-               $condition = ['gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'private' => Item::PUBLIC,
-                       'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN], 'author-blocked' => false, 'author-hidden' => false];
+               $condition = [
+                       'gravity'        => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
+                       'private'        => Item::PUBLIC,
+                       'network'        => [Protocol::ACTIVITYPUB, Protocol::DFRN],
+                       'author-blocked' => false,
+                       'author-hidden'  => false
+               ];
 
                return self::getCollection($condition, DI::baseUrl() . '/inbox', $page, $max_id, $uid, null);
        }