Cleanup code, add basic functionality for Nests

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

@@ -44,7 +44,8 @@ class DatabaseController extends ApplicationApiController
         DatabaseManagementService $databaseManagementService,
         DatabasePasswordService $databasePasswordService,
         DatabaseRepositoryInterface $repository
-    ) {
+    )
+    {
         parent::__construct();
 
         $this->databaseManagementService = $databaseManagementService;
@@ -58,7 +59,9 @@ class DatabaseController extends ApplicationApiController
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\GetServerDatabasesRequest $request
      * @param \Pterodactyl\Models\Server $server
+     *
      * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function index(GetServerDatabasesRequest $request, Server $server): array
     {
@@ -73,7 +76,9 @@ class DatabaseController extends ApplicationApiController
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\GetServerDatabaseRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @param \Pterodactyl\Models\Database $database
+     *
      * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function view(GetServerDatabaseRequest $request, Server $server, Database $database): array
     {
@@ -88,6 +93,7 @@ class DatabaseController extends ApplicationApiController
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\ServerDatabaseWriteRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @param \Pterodactyl\Models\Database $database
+     *
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Throwable
@@ -96,7 +102,7 @@ class DatabaseController extends ApplicationApiController
     {
         $this->databasePasswordService->handle($database);
 
-        return JsonResponse::create([], JsonResponse::HTTP_NO_CONTENT);
+        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
     }
 
     /**
@@ -104,6 +110,7 @@ class DatabaseController extends ApplicationApiController
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\StoreServerDatabaseRequest $request
      * @param \Pterodactyl\Models\Server $server
+     *
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Throwable
@@ -129,14 +136,16 @@ class DatabaseController extends ApplicationApiController
      * Handle a request to delete a specific server database from the Panel.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\Databases\ServerDatabaseWriteRequest $request
-     * @return \Illuminate\Http\Response
+     * @param \Pterodactyl\Models\Database $database
      *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Exception
      */
-    public function delete(ServerDatabaseWriteRequest $request): Response
+    public function delete(ServerDatabaseWriteRequest $request, Database $database): JsonResponse
     {
-        $this->databaseManagementService->delete($request->getModel(Database::class));
+        $this->databaseManagementService->delete($database);
 
-        return response('', 204);
+        return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
     }
 }

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

@@ -12,7 +12,9 @@ class ExternalServerController extends ApplicationApiController
      * Retrieve a specific server from the database using its external ID.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\GetExternalServerRequest $request
+     *
      * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function index(GetExternalServerRequest $request): array
     {

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

@@ -22,12 +22,10 @@ class ServerController extends ApplicationApiController
      * @var \Pterodactyl\Services\Servers\ServerCreationService
      */
     private $creationService;
-
     /**
      * @var \Pterodactyl\Services\Servers\ServerDeletionService
      */
     private $deletionService;
-
     /**
      * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
      */
@@ -44,7 +42,8 @@ class ServerController extends ApplicationApiController
         ServerCreationService $creationService,
         ServerDeletionService $deletionService,
         ServerRepositoryInterface $repository
-    ) {
+    )
+    {
         parent::__construct();
 
         $this->creationService = $creationService;
@@ -56,7 +55,9 @@ class ServerController extends ApplicationApiController
      * Return all of the servers that currently exist on the Panel.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\GetServersRequest $request
+     *
      * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function index(GetServersRequest $request): array
     {
@@ -74,12 +75,12 @@ class ServerController extends ApplicationApiController
      * Create a new server on the system.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\StoreServerRequest $request
+     *
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Throwable
      * @throws \Illuminate\Validation\ValidationException
      * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableAllocationException
      * @throws \Pterodactyl\Exceptions\Service\Deployment\NoViableNodeException
@@ -97,22 +98,28 @@ class ServerController extends ApplicationApiController
      * Show a single server transformed for the application API.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\GetServerRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     *
      * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
-    public function view(GetServerRequest $request): array
+    public function view(GetServerRequest $request, Server $server): array
     {
-        return $this->fractal->item($request->getModel(Server::class))
+        return $this->fractal->item($server)
             ->transformWith($this->getTransformer(ServerTransformer::class))
             ->toArray();
     }
 
     /**
+     * Deletes a server.
+     *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest $request
      * @param \Pterodactyl\Models\Server $server
      * @param string $force
+     *
      * @return \Illuminate\Http\Response
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Throwable
      */
     public function delete(ServerWriteRequest $request, Server $server, string $force = ''): Response
     {

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

@@ -42,16 +42,17 @@ class ServerDetailsController extends ApplicationApiController
      * Update the details for a specific server.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerDetailsRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     *
      * @return array
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     * @throws \Throwable
      */
-    public function details(UpdateServerDetailsRequest $request): array
+    public function details(UpdateServerDetailsRequest $request, Server $server): array
     {
         $server = $this->detailsModificationService->returnUpdatedModel()->handle(
-            $request->getModel(Server::class), $request->validated()
+            $server, $request->validated()
         );
 
         return $this->fractal->item($server)
@@ -64,11 +65,11 @@ class ServerDetailsController extends ApplicationApiController
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerBuildConfigurationRequest $request
      * @param \Pterodactyl\Models\Server $server
+     *
      * @return array
      *
+     * @throws \Throwable
      * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function build(UpdateServerBuildConfigurationRequest $request, Server $server): array
     {

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

@@ -42,6 +42,7 @@ class ServerManagementController extends ApplicationApiController
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest $request
      * @param \Pterodactyl\Models\Server $server
+     *
      * @return \Illuminate\Http\Response
      *
      * @throws \Throwable
@@ -58,6 +59,7 @@ class ServerManagementController extends ApplicationApiController
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest $request
      * @param \Pterodactyl\Models\Server $server
+     *
      * @return \Illuminate\Http\Response
      *
      * @throws \Throwable
@@ -74,11 +76,10 @@ class ServerManagementController extends ApplicationApiController
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\ServerWriteRequest $request
      * @param \Pterodactyl\Models\Server $server
+     *
      * @return \Illuminate\Http\Response
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Throwable
      */
     public function reinstall(ServerWriteRequest $request, Server $server): Response
     {

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

@@ -32,18 +32,16 @@ class StartupController extends ApplicationApiController
      * Update the startup and environment settings for a specific server.
      *
      * @param \Pterodactyl\Http\Requests\Api\Application\Servers\UpdateServerStartupRequest $request
-     * @return array
+     * @param \Pterodactyl\Models\Server $server
      *
-     * @throws \Illuminate\Validation\ValidationException
-     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @return array
+     * @throws \Throwable
      */
-    public function index(UpdateServerStartupRequest $request): array
+    public function index(UpdateServerStartupRequest $request, Server $server): array
     {
         $server = $this->modificationService
             ->setUserLevel(User::USER_LEVEL_ADMIN)
-            ->handle($request->getModel(Server::class), $request->validated());
+            ->handle($server, $request->validated());
 
         return $this->fractal->item($server)
             ->transformWith($this->getTransformer(ServerTransformer::class))