From f5ffc9da95674783f7018ded4511cfdb12ec96f7 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Mon, 20 Feb 2023 10:18:15 -0500 Subject: [PATCH] Remove extraneous ID parameter from Mastodon Blocks Listing API --- src/Module/Api/Mastodon/Blocks.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php index 2c2adad2a6..55e65b6196 100644 --- a/src/Module/Api/Mastodon/Blocks.php +++ b/src/Module/Api/Mastodon/Blocks.php @@ -39,15 +39,6 @@ class Blocks extends BaseApi self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($this->parameters['id'])) { - DI::mstdnError()->UnprocessableEntity(); - } - - $id = $this->parameters['id']; - if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { - DI::mstdnError()->RecordNotFound(); - } - $request = $this->getRequest([ 'max_id' => 0, // Return results older than this id 'since_id' => 0, // Return results newer than this id @@ -57,7 +48,7 @@ class Blocks extends BaseApi $params = ['order' => ['cid' => true], 'limit' => $request['limit']]; - $condition = ['cid' => $id, 'blocked' => true, 'uid' => $uid]; + $condition = ['blocked' => true, 'uid' => $uid]; if (!empty($request['max_id'])) { $condition = DBA::mergeConditions($condition, ["`cid` < ?", $request['max_id']]); @@ -74,6 +65,7 @@ class Blocks 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); -- 2.39.5