More work on the API utilizing Laravel 5.5 exception rendering

Also corrects API format to maintain JSONAPI spec

app/Http/Controllers/API/Admin/Nodes/NodeController.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\API\Admin\Nodes;
+
+use Spatie\Fractal\Fractal;
+use Illuminate\Http\Request;
+use Pterodactyl\Models\Node;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Transformers\Api\Admin\NodeTransformer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
+
+class NodeController extends Controller
+{
+    /**
+     * @var \Spatie\Fractal\Fractal
+     */
+    private $fractal;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
+     */
+    private $repository;
+
+    /**
+     * NodeController constructor.
+     *
+     * @param \Spatie\Fractal\Fractal                                   $fractal
+     * @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository
+     */
+    public function __construct(Fractal $fractal, NodeRepositoryInterface $repository)
+    {
+        $this->fractal = $fractal;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Return all of the nodes currently available on the Panel.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function index(Request $request): array
+    {
+        $nodes = $this->repository->all(config('pterodactyl.paginate.api.nodes'));
+
+        $fractal = $this->fractal->collection($nodes)
+            ->transformWith(new NodeTransformer($request))
+            ->withResourceName('node')
+            ->paginateWith(new IlluminatePaginatorAdapter($nodes));
+
+        return $fractal->toArray();
+    }
+
+    /**
+     * Return data for a single instance of a node.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Pterodactyl\Models\Node $node
+     * @return array
+     */
+    public function view(Request $request, Node $node): array
+    {
+        $fractal = $this->fractal->item($node)
+            ->transformWith(new NodeTransformer($request))
+            ->withResourceName('node');
+
+        return $fractal->toArray();
+    }
+}

app/Http/Controllers/API/Admin/Users/UserController.php

@@ -11,8 +11,8 @@ use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Users\UserUpdateService;
 use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Services\Users\UserDeletionService;
-use Pterodactyl\Transformers\Admin\UserTransformer;
 use Pterodactyl\Http\Requests\Admin\UserFormRequest;
+use Pterodactyl\Transformers\Api\Admin\UserTransformer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
@@ -83,7 +83,7 @@ class UserController extends Controller
             ->withResourceName('user')
             ->paginateWith(new IlluminatePaginatorAdapter($users));
 
-        if (config('pterodactyl.api.include_on_list') && $request->has('include')) {
+        if (config('pterodactyl.api.include_on_list') && $request->filled('include')) {
             $fractal->parseIncludes(explode(',', $request->input('include')));
         }
 
@@ -104,7 +104,7 @@ class UserController extends Controller
             ->transformWith(new UserTransformer($request))
             ->withResourceName('user');
 
-        if ($request->has('include')) {
+        if ($request->filled('include')) {
             $fractal->parseIncludes(explode(',', $request->input('include')));
         }