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 185756cdf8634ce51c668df8c48a6e0f2a33ae42..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:
@@ -228,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']  = '';
                                }
@@ -239,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']  = '';
@@ -266,7 +268,7 @@ class Statuses extends BaseApi
                }
 
                if ($request['in_reply_to_id']) {
-                       $parent = Post::selectFirst(['uri'], ['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 . '.');
                        }
@@ -391,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']];