fix: regressions

framework/core/src/Api/Endpoint/Concerns/ExtractsListingParams.php

@@ -90,7 +90,7 @@ trait ExtractsListingParams
         return [
             'filter' => RequestUtil::extractFilter($context->request),
             'sort' => RequestUtil::extractSort($context->request, $this->defaultSort, $this->getAvailableSorts($context)),
-            'limit' => $limit = (RequestUtil::extractLimit($context->request, $this->limit, $this->maxLimit) ?? -1),
+            'limit' => $limit = (RequestUtil::extractLimit($context->request, $this->limit, $this->maxLimit) ?? null),
             'offset' => RequestUtil::extractOffset($context->request, $limit),
         ];
     }

framework/core/src/Api/Resource/DiscussionResource.php

@@ -193,42 +193,46 @@ class DiscussionResource extends AbstractDatabaseResource
                 ->includable()
                 ->type('posts'),
             Schema\Relationship\ToMany::make('posts')
-                ->withLinkage()
+                ->withLinkage(function (Context $context) {
+                    return $context->collection instanceof self && $context->endpoint instanceof Endpoint\Show;
+                })
                 ->includable()
                 ->get(function (Discussion $discussion, Context $context) {
-                    if ($context->collection instanceof self && $context->endpoint instanceof Endpoint\Show) {
+                    $showingDiscussion = $context->collection instanceof self && $context->endpoint instanceof Endpoint\Show;
-                        $actor = $context->getActor();
 
-                        $limit = $context->endpoint->extractLimitValue($context, $context->endpoint->defaultExtracts($context));
+                    if (! $showingDiscussion) {
-
+                        return fn () => $discussion->posts->all();
-                        if (($near = Arr::get($context->request->getQueryParams(), 'page.near')) > 1) {
-                            $offset = $this->posts->getIndexForNumber($discussion->id, $near, $actor);
-                            $offset = max(0, $offset - $limit / 2);
-                        } else {
-                            $offset = $context->endpoint->extractOffsetValue($context, $context->endpoint->defaultExtracts($context));
-                        }
-
-                        $posts = $discussion->posts()
-                            ->whereVisibleTo($actor)
-                            ->orderBy('number')
-                            ->skip($offset)
-                            ->take($limit)
-                            ->get();
-
-                        /** @var Post $post */
-                        foreach ($posts as $post) {
-                            $post->setRelation('discussion', $discussion);
-                        }
-
-                        $allPosts = $discussion->posts()->whereVisibleTo($actor)->orderBy('number')->pluck('id')->all();
-                        $loadedPosts = $posts->all();
-
-                        array_splice($allPosts, $offset, $limit, $loadedPosts);
-
-                        return $allPosts;
                     }
 
-                    return [];
+                    $actor = $context->getActor();
+
+                    $limit = PostResource::$defaultLimit;
+
+                    if (($near = Arr::get($context->request->getQueryParams(), 'page.near')) > 1) {
+                        $offset = $this->posts->getIndexForNumber($discussion->id, $near, $actor);
+                        $offset = max(0, $offset - $limit / 2);
+                    } else {
+                        $offset = $context->endpoint->extractOffsetValue($context, $context->endpoint->defaultExtracts($context));
+                    }
+
+                    $posts = $discussion->posts()
+                        ->whereVisibleTo($actor)
+                        ->orderBy('number')
+                        ->skip($offset)
+                        ->take($limit)
+                        ->get();
+
+                    /** @var Post $post */
+                    foreach ($posts as $post) {
+                        $post->setRelation('discussion', $discussion);
+                    }
+
+                    $allPosts = $discussion->posts()->whereVisibleTo($actor)->orderBy('number')->pluck('id')->all();
+                    $loadedPosts = $posts->all();
+
+                    array_splice($allPosts, $offset, $limit, $loadedPosts);
+
+                    return $allPosts;
                 }),
             Schema\Relationship\ToOne::make('mostRelevantPost')
                 ->visible(fn (Discussion $model, Context $context) => $context->endpoint instanceof Endpoint\Index)

framework/core/src/Api/Resource/NotificationResource.php

@@ -10,6 +10,7 @@ use Flarum\Bus\Dispatcher;
 use Flarum\Notification\Command\ReadNotification;
 use Flarum\Notification\Notification;
 use Flarum\Notification\NotificationRepository;
+use Illuminate\Database\Eloquent\Builder;
 use Tobyz\JsonApiServer\Pagination\Pagination;
 
 class NotificationResource extends AbstractDatabaseResource
@@ -32,7 +33,7 @@ class NotificationResource extends AbstractDatabaseResource
 
     public function query(\Tobyz\JsonApiServer\Context $context): object
     {
-        if ($context->endpoint instanceof Endpoint\Index) {
+        if ($context->collection instanceof self && $context->endpoint instanceof Endpoint\Index) {
             /** @var Pagination $pagination */
             $pagination = ($context->endpoint->paginationResolver)($context);
 

framework/core/src/Api/Resource/PostResource.php

@@ -23,6 +23,8 @@ use Tobyz\JsonApiServer\Exception\BadRequestException;
 
 class PostResource extends AbstractDatabaseResource
 {
+    public static int $defaultLimit = 20;
+
     public function __construct(
         protected PostRepository $posts,
         protected TranslatorInterface $translator,
@@ -137,7 +139,7 @@ class PostResource extends AbstractDatabaseResource
                     'hiddenUser',
                     'discussion'
                 ])
-                ->paginate(),
+                ->paginate(static::$defaultLimit),
         ];
     }
 

framework/core/src/Http/RequestUtil.php

@@ -37,7 +37,13 @@ class RequestUtil
 
     public static function extractSort(Request $request, ?string $default, array $available = []): ?array
     {
-        if (! ($input = $request->getQueryParams()['sort'] ?? $default)) {
+        $input = $request->getQueryParams()['sort'] ?? null;
+
+        if (is_null($input) || ! filled($input)) {
+            $input = $default;
+        }
+
+        if (! $input) {
             return null;
         }
 
@@ -71,7 +77,11 @@ class RequestUtil
 
     public static function extractLimit(Request $request, ?int $defaultLimit = null, ?int $max = null): ?int
     {
-        $limit = (int) ($request->getQueryParams()['page']['limit'] ?? $defaultLimit);
+        $limit = $request->getQueryParams()['page']['limit'] ?? '';
+
+        if (is_null($limit) || ! filled($limit)) {
+            $limit = $defaultLimit;
+        }
 
         if (! $limit) {
             return null;

framework/core/src/Search/Database/AbstractSearcher.php

@@ -39,7 +39,7 @@ abstract class AbstractSearcher implements SearcherInterface
 
         $this->applySort($search, $criteria->sort, $criteria->sortIsDefault);
         $this->applyOffset($search, $criteria->offset);
-        $this->applyLimit($search, $criteria->limit + 1);
+        $this->applyLimit($search, $criteria->limit ? $criteria->limit + 1 : null);
 
         foreach ($this->mutators as $mutator) {
             $mutator($search, $criteria);
@@ -102,7 +102,7 @@ abstract class AbstractSearcher implements SearcherInterface
 
     protected function applyLimit(DatabaseSearchState $state, ?int $limit): void
     {
-        if ($limit > 0) {
+        if ($limit && $limit > 0) {
             $state->getQuery()->take($limit);
         }
     }

framework/core/tests/integration/api/discussions/ShowTest.php

@@ -53,7 +53,7 @@ class ShowTest extends TestCase
             ])
         );
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals(200, $response->getStatusCode(), $response->getBody()->getContents());
     }
 
     /**
@@ -71,7 +71,7 @@ class ShowTest extends TestCase
             ])
         );
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals(200, $response->getStatusCode(), $response->getBody()->getContents());
     }
 
     /**
@@ -113,7 +113,7 @@ class ShowTest extends TestCase
 
         $json = json_decode($response->getBody()->getContents(), true);
 
-        $this->assertEquals(2, Arr::get($json, 'data.relationships.posts.data.0.id'));
+        $this->assertEquals(2, Arr::get($json, 'data.relationships.posts.data.0.id'), $response->getBody()->getContents());
     }
 
     /**
@@ -125,7 +125,7 @@ class ShowTest extends TestCase
             $this->request('GET', '/api/discussions/2')
         );
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals(200, $response->getStatusCode(), $response->getBody()->getContents());
     }
 
     /**

framework/core/tests/integration/extenders/ApiControllerTest.php

@@ -78,9 +78,9 @@ class ApiControllerTest extends TestCase
             ])
         );
 
-        $payload = json_decode($response->getBody()->getContents(), true);
+        $payload = json_decode($body = $response->getBody()->getContents(), true);
 
-        $this->assertEquals('dataSerializationPrepCustomTitle', $payload['data']['attributes']['title']);
+        $this->assertEquals('dataSerializationPrepCustomTitle', $payload['data']['attributes']['title'], $body);
     }
 
     /**