Issue #13823: Fix "Mutes" endpoint (#13916)

diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php
index c37dbfd9428f69127c47068be7f32a5310574f22..9e5b34787fea6625e39065fbd577298d52267d5d 100644 (file)
--- a/src/Module/Api/Mastodon/Blocks.php
+++ b/src/Module/Api/Mastodon/Blocks.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\BaseApi;

diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php
index 2ea8b3b77f4cfa9d2a2d72c63a5f71d33094058e..8cb0868509129d79c025e86908224674aee2f702 100644 (file)
--- a/src/Module/Api/Mastodon/Mutes.php
+++ b/src/Module/Api/Mastodon/Mutes.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
@@ -39,15 +38,6 @@ class Mutes extends BaseApi
                $this->checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();
 
-               if (empty($this->parameters['id'])) {
-                       $this->logAndJsonError(422, $this->errorFactory->UnprocessableEntity());
-               }
-
-               $id = $this->parameters['id'];
-               if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) {
-                       $this->logAndJsonError(404, $this->errorFactory->RecordNotFound());
-               }
-
                $request = $this->getRequest([
                        'max_id'   => 0,  // Return results older than this id
                        'since_id' => 0,  // Return results newer than this id
@@ -57,7 +47,7 @@ class Mutes extends BaseApi
 
                $params = ['order' => ['cid' => true], 'limit' => $request['limit']];
 
-               $condition = ['cid' => $id, 'ignored' => true, 'uid' => $uid];
+               $condition = ['ignored' => true, 'uid' => $uid];
 
                if (!empty($request['max_id'])) {
                        $condition = DBA::mergeConditions($condition, ["`cid` < ?", $request['max_id']]);
@@ -74,6 +64,7 @@ class Mutes extends BaseApi
                }
 
                $followers = DBA::select('user-contact', ['cid'], $condition, $params);
+               $accounts = [];
                while ($follower = DBA::fetch($followers)) {
                        self::setBoundaries($follower['cid']);
                        $accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid);