Always allow specifying a page size with the API; closes pterodactyl#3218

Author: DaneEveritt

app/Http/Controllers/Api/Application/Locations/LocationController.php

@@ -65,7 +65,7 @@ public function index(GetLocationsRequest $request): array
         $locations = QueryBuilder::for(Location::query())
             ->allowedFilters(['short', 'long'])
             ->allowedSorts(['id'])
-            ->paginate(100);
+            ->paginate($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($locations)
             ->transformWith($this->getTransformer(LocationTransformer::class))

app/Http/Controllers/Api/Application/Nests/NestController.php

@@ -30,7 +30,7 @@ public function __construct(NestRepositoryInterface $repository)
      */
     public function index(GetNestsRequest $request): array
     {
-        $nests = $this->repository->paginated(50);
+        $nests = $this->repository->paginated($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($nests)
             ->transformWith($this->getTransformer(NestTransformer::class))

app/Http/Controllers/Api/Application/Nodes/AllocationController.php

@@ -43,7 +43,7 @@ public function __construct(
      */
     public function index(GetAllocationsRequest $request, Node $node): array
     {
-        $allocations = $node->allocations()->paginate(50);
+        $allocations = $node->allocations()->paginate($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($allocations)
             ->transformWith($this->getTransformer(AllocationTransformer::class))
@@ -53,6 +53,7 @@ public function index(GetAllocationsRequest $request, Node $node): array
     /**
      * Store new allocations for a given node.
      *
+     * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\CidrOutOfRangeException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\InvalidPortMappingException
      * @throws \Pterodactyl\Exceptions\Service\Allocation\PortOutOfRangeException

app/Http/Controllers/Api/Application/Nodes/NodeController.php

@@ -64,7 +64,7 @@ public function index(GetNodesRequest $request): array
         $nodes = QueryBuilder::for(Node::query())
             ->allowedFilters(['uuid', 'name', 'fqdn', 'daemon_token_id'])
             ->allowedSorts(['id', 'uuid', 'memory', 'disk'])
-            ->paginate(100);
+            ->paginate($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($nodes)
             ->transformWith($this->getTransformer(NodeTransformer::class))

app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php

@@ -37,7 +37,7 @@ public function __invoke(GetDeployableNodesRequest $request): array
         $nodes = $this->viableNodesService->setLocations($data['location_ids'] ?? [])
             ->setMemory($data['memory'])
             ->setDisk($data['disk'])
-            ->handle($request->input('page') ?? 0);
+            ->handle($request->query('per_page'), $request->query('page'));
 
         return $this->fractal->collection($nodes)
             ->transformWith($this->getTransformer(NodeTransformer::class))

app/Http/Controllers/Api/Application/Servers/ServerController.php

@@ -56,7 +56,7 @@ public function index(GetServersRequest $request): array
         $servers = QueryBuilder::for(Server::query())
             ->allowedFilters(['uuid', 'name', 'image', 'external_id'])
             ->allowedSorts(['id', 'uuid'])
-            ->paginate(100);
+            ->paginate($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($servers)
             ->transformWith($this->getTransformer(ServerTransformer::class))

app/Http/Controllers/Api/Application/Users/UserController.php

@@ -66,7 +66,7 @@ public function index(GetUsersRequest $request): array
         $users = QueryBuilder::for(User::query())
             ->allowedFilters(['email', 'uuid', 'username', 'external_id'])
             ->allowedSorts(['id', 'uuid'])
-            ->paginate(100);
+            ->paginate($request->query('per_page') ?? 50);
 
         return $this->fractal->collection($users)
             ->transformWith($this->getTransformer(UserTransformer::class))

app/Services/Deployment/FindViableNodesService.php

@@ -83,7 +83,7 @@ public function setMemory(int $memory): self
      *
      * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException
      */
-    public function handle(int $page = null)
+    public function handle(int $perPage = null, int $page = null)
     {
         Assert::integer($this->disk, 'Disk space must be an int, got %s');
         Assert::integer($this->memory, 'Memory usage must be an int, got %s');
@@ -103,7 +103,7 @@ public function handle(int $page = null)
             ->havingRaw('(IFNULL(SUM(servers.disk), 0) + ?) <= (nodes.disk * (1 + (nodes.disk_overallocate / 100)))', [$this->disk]);
 
         if (!is_null($page)) {
-            $results = $results->paginate(50, ['*'], 'page', $page);
+            $results = $results->paginate($perPage ?? 50, ['*'], 'page', $page);
         } else {
             $results = $results->get()->toBase();
         }