Merge pull request #13176 from MrPetovan/bug/warnings

[friendica.git] / src / Module / Api / Mastodon / Statuses.php

diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 3080c28043860944a2011687933668a94fc482fb..dad0451fc424ad00c16fb7ad5eaffac4cb64524b 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -30,7 +30,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
@@ -71,7 +71,7 @@ class Statuses extends BaseApi
                        'origin'     => true,
                ];
 
-               $post = Post::selectFirst(['uri-id', 'id', 'gravity', 'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'network'], $condition);
+               $post = Post::selectFirst(['uri-id', 'id', 'gravity', 'verb', 'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'network'], $condition);
                if (empty($post['id'])) {
                        throw new HTTPException\NotFoundException('Item with URI ID ' . $this->parameters['id'] . ' not found for user ' . $uid . '.');
                }
@@ -87,6 +87,8 @@ class Statuses extends BaseApi
                $item['uid']        = $post['uid'];
                $item['body']       = $body;
                $item['network']    = $post['network'];
+               $item['gravity']    = $post['gravity'];
+               $item['verb']       = $post['verb'];
                $item['app']        = $this->getApp();
 
                if (!empty($request['language'])) {
@@ -108,7 +110,7 @@ class Statuses extends BaseApi
                        }
                }
 
-               $item = DI::contentItem()->expandTags($item, $request['visibility'] == 'direct');
+               $item = DI::contentItem()->expandTags($item);
 
                /*
                The provided ids in the request value consists of these two sources:
@@ -150,6 +152,9 @@ class Statuses extends BaseApi
                        throw new \Exception('Missing parameters in definition');
                }
 
+               // Link Preview Attachment Processing
+               Post\Media::deleteByURIId($post['uri-id'], [Post\Media::HTML]);
+
                Item::update($item, ['id' => $post['id']]);
 
                foreach (Tag::getByURIId($post['uri-id']) as $tagToRemove) {
@@ -178,7 +183,7 @@ class Statuses extends BaseApi
                        'sensitive'      => false, // Mark status and attached media as sensitive?
                        'spoiler_text'   => '',    // Text to be shown as a warning or subject before the actual content. Statuses are generally collapsed behind this field.
                        'visibility'     => '',    // Visibility of the posted status. One of: "public", "unlisted", "private" or "direct".
-                       'scheduled_at'   => '',    // ISO 8601 Datetime at which to schedule a status. Providing this paramter will cause ScheduledStatus to be returned instead of Status. Must be at least 5 minutes in the future.
+                       'scheduled_at'   => '',    // ISO 8601 Datetime at which to schedule a status. Providing this parameter will cause ScheduledStatus to be returned instead of Status. Must be at least 5 minutes in the future.
                        'language'       => '',    // ISO 639 language code for this status.
                        'friendica'      => [],    // Friendica extensions to the standard Mastodon API spec
                ], $request);
@@ -225,7 +230,7 @@ class Statuses extends BaseApi
                                        $item['deny_gid']  = $owner['deny_gid'];
                                } else {
                                        $item['allow_cid'] = '';
-                                       $item['allow_gid'] = '<' . Group::FOLLOWERS . '>';
+                                       $item['allow_gid'] = '<' . Circle::FOLLOWERS . '>';
                                        $item['deny_cid']  = '';
                                        $item['deny_gid']  = '';
                                }
@@ -236,7 +241,7 @@ class Statuses extends BaseApi
                                // The permissions are assigned in "expandTags"
                                break;
                        default:
-                               if (is_numeric($request['visibility']) && Group::exists($request['visibility'], $uid)) {
+                               if (is_numeric($request['visibility']) && Circle::exists($request['visibility'], $uid)) {
                                        $item['allow_cid'] = '';
                                        $item['allow_gid'] = '<' . $request['visibility'] . '>';
                                        $item['deny_cid']  = '';
@@ -263,15 +268,14 @@ class Statuses extends BaseApi
                }
 
                if ($request['in_reply_to_id']) {
-                       $parent = Post::selectFirst(['uri', 'private'], ['uri-id' => $request['in_reply_to_id'], 'uid' => [0, $uid]]);
+                       $parent = Post::selectOriginal(['uri'], ['uri-id' => $request['in_reply_to_id'], 'uid' => [0, $uid]]);
+                       if (empty($parent)) {
+                               throw new HTTPException\NotFoundException('Item with URI ID ' . $request['in_reply_to_id'] . ' not found for user ' . $uid . '.');
+                       }
 
                        $item['thr-parent']  = $parent['uri'];
                        $item['gravity']     = Item::GRAVITY_COMMENT;
                        $item['object-type'] = Activity\ObjectType::COMMENT;
-
-                       if (in_array($parent['private'], [Item::UNLISTED, Item::PUBLIC]) && ($item['private'] == Item::PRIVATE)) {
-                               throw new HTTPException\NotImplementedException('Private replies for public posts are not implemented.');
-                       }
                } else {
                        self::checkThrottleLimit();
 
@@ -389,9 +393,8 @@ class Statuses extends BaseApi
                                continue;
                        }
 
-                       Photo::setPermissionForRessource($media[0]['resource-id'], $item['uid'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']);
+                       Photo::setPermissionForResource($media[0]['resource-id'], $item['uid'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']);
 
-                       $ressources[] = $media[0]['resource-id'];
                        $phototypes = Images::supportedTypes();
                        $ext = $phototypes[$media[0]['type']];