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 a232112de8bfa45e538172197182bd9876680268..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;
@@ -230,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']  = '';
                                }
@@ -241,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']  = '';
@@ -268,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 . '.');
                        }