API: Support for the "direct" visibility

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 334507861b6e1406910132e7de62ea2647716e88..f6906b79629b142417ca4c77a375d85c09bdca32 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -494,7 +494,7 @@ class Item
                return true;
        }
 
-       public function expandTags(array $item)
+       public function expandTags(array $item, bool $setPermissions = false)
        {
                // Look for any tags and linkify them
                $item['inform'] = '';
@@ -502,6 +502,7 @@ class Item
                $private_id     = null;
                $only_to_forum  = false;
                $forum_contact  = [];
+               $receivers      = [];
 
                // Convert mentions in the body to a unified format
                $item['body'] = BBCode::setMentions($item['body'], $item['uid'], $item['network']);
@@ -509,6 +510,9 @@ class Item
                // Search for forum mentions
                foreach (Tag::getFromBody($item['body'], Tag::TAG_CHARACTER[Tag::MENTION] . Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]) as $tag) {
                        $contact = Contact::getByURLForUser($tag[2], $item['uid']);
+
+                       $receivers[] = $contact['id'];
+
                        if (!empty($item['inform'])) {
                                $item['inform'] .= ',';
                        }
@@ -554,6 +558,22 @@ class Item
                                $item['allow_cid'] = '';
                                $item['allow_gid'] = '';
                        }
+               } elseif ($setPermissions && ($item['gravity'] == GRAVITY_PARENT)) {
+                       if (empty($receivers)) {
+                               // For security reasons direct posts without any receiver will be posts to yourself
+                               $self = Contact::selectFirst(['id'], ['uid' => $item['uid'], 'self' => true]);
+                               $receivers[] = $self['id'];
+                       }
+
+                       $item['private']   = ModelItem::PRIVATE;
+                       $item['allow_cid'] = '';
+                       $item['allow_gid'] = '';
+                       $item['deny_cid']  = '';
+                       $item['deny_gid']  = '';
+
+                       foreach ($receivers as $receiver) {
+                               $item['allow_cid'] .= '<' . $receiver . '>';
+                       }
                }
                return $item;
        }

diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 6bee30768307f54d93e395f37a6768f597fcfc5c..4cb9bdb1dc9ecd441fbf7a3a1a4fd79ccd022a6f 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -110,8 +110,7 @@ class Statuses extends BaseApi
                                $item['private'] = Item::PRIVATE;
                                break;
                        case 'direct':
-                               // Direct messages are currently unsupported
-                               DI::mstdnError()->InternalError('Direct messages are currently unsupported');
+                               // The permissions are assigned in "expandTags"
                                break;
                        default:
                                if (is_numeric($request['visibility']) && Group::exists($request['visibility'], $uid)) {
@@ -152,7 +151,7 @@ class Statuses extends BaseApi
                        $item['object-type'] = Activity\ObjectType::NOTE;
                }
 
-               $item = DI::contentItem()->expandTags($item);
+               $item = DI::contentItem()->expandTags($item, $request['visibility'] == 'direct');
 
                if (!empty($request['media_ids'])) {
                        $item['object-type'] = Activity\ObjectType::IMAGE;