Replace nest repository

app/Http/Controllers/Admin/MountController.php

@@ -15,7 +15,6 @@ use Illuminate\View\Factory as ViewFactory;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Http\Requests\Admin\MountFormRequest;
 use Pterodactyl\Repositories\Eloquent\MountRepository;
-use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
 
 class MountController extends Controller
@@ -25,7 +24,6 @@ class MountController extends Controller
      */
     public function __construct(
         protected AlertsMessageBag $alert,
-        protected NestRepositoryInterface $nestRepository,
         protected LocationRepositoryInterface $locationRepository,
         protected MountRepository $repository,
         protected ViewFactory $view

app/Http/Controllers/Admin/Nests/EggController.php

@@ -5,6 +5,7 @@ namespace Pterodactyl\Http\Controllers\Admin\Nests;
 use JavaScript;
 use Illuminate\View\View;
 use Pterodactyl\Models\Egg;
+use Pterodactyl\Models\Nest;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\View\Factory as ViewFactory;
@@ -14,7 +15,7 @@ use Pterodactyl\Services\Eggs\EggCreationService;
 use Pterodactyl\Services\Eggs\EggDeletionService;
 use Pterodactyl\Http\Requests\Admin\Egg\EggFormRequest;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
-use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
+use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 
 class EggController extends Controller
 {
@@ -27,19 +28,16 @@ class EggController extends Controller
         protected EggDeletionService $deletionService,
         protected EggRepositoryInterface $repository,
         protected EggUpdateService $updateService,
-        protected NestRepositoryInterface $nestRepository,
         protected ViewFactory $view
     ) {
     }
 
     /**
      * Handle a request to display the Egg creation page.
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function create(): View
     {
-        $nests = $this->nestRepository->getWithEggs();
+        $nests = Nest::with('eggs.variables')->get();
         JavaScript::put(['nests' => $nests->keyBy('id')]);
 
         return $this->view->make('admin.eggs.new', ['nests' => $nests]);
@@ -81,7 +79,7 @@ class EggController extends Controller
      * Handle request to update an Egg.
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Egg\NoParentConfigurationFoundException
      */
     public function update(EggFormRequest $request, Egg $egg): RedirectResponse

app/Http/Controllers/Admin/Nests/NestController.php

@@ -7,10 +7,10 @@ use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\View\Factory as ViewFactory;
 use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Models\Nest;
 use Pterodactyl\Services\Nests\NestUpdateService;
 use Pterodactyl\Services\Nests\NestCreationService;
 use Pterodactyl\Services\Nests\NestDeletionService;
-use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Http\Requests\Admin\Nest\StoreNestFormRequest;
 
 class NestController extends Controller
@@ -22,7 +22,6 @@ class NestController extends Controller
         protected AlertsMessageBag $alert,
         protected NestCreationService $nestCreationService,
         protected NestDeletionService $nestDeletionService,
-        protected NestRepositoryInterface $repository,
         protected NestUpdateService $nestUpdateService,
         protected ViewFactory $view
     ) {
@@ -31,12 +30,13 @@ class NestController extends Controller
     /**
      * Render nest listing page.
      *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function index(): View
     {
+        $nests = Nest::query()->withCount(['eggs', 'servers']);
+
         return $this->view->make('admin.nests.index', [
-            'nests' => $this->repository->getWithCounts(),
+            'nests' => $nests,
         ]);
     }
 
@@ -64,12 +64,11 @@ class NestController extends Controller
     /**
      * Return details about a nest including all the eggs and servers per egg.
      *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function view(int $nest): View
     {
         return $this->view->make('admin.nests.view', [
-            'nest' => $this->repository->getWithEggServers($nest),
+            'nest' => Nest::with('eggs.servers')->findOrFail($nest),
         ]);
     }
 

app/Http/Controllers/Admin/Servers/CreateServerController.php

@@ -4,13 +4,13 @@ namespace Pterodactyl\Http\Controllers\Admin\Servers;
 
 use JavaScript;
 use Illuminate\View\View;
+use Pterodactyl\Models\Nest;
 use Pterodactyl\Models\Node;
 use Pterodactyl\Models\Location;
 use Illuminate\Http\RedirectResponse;
 use Prologue\Alerts\AlertsMessageBag;
 use Illuminate\View\Factory as ViewFactory;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Repositories\Eloquent\NestRepository;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
 use Pterodactyl\Services\Servers\ServerCreationService;
@@ -22,7 +22,6 @@ class CreateServerController extends Controller
      */
     public function __construct(
         private AlertsMessageBag $alert,
-        private NestRepository $nestRepository,
         private NodeRepository $nodeRepository,
         private ServerCreationService $creationService,
         private ViewFactory $view
@@ -43,7 +42,7 @@ class CreateServerController extends Controller
             return redirect()->route('admin.nodes');
         }
 
-        $nests = $this->nestRepository->getWithEggs();
+        $nests = Nest::with('eggs.variables')->get();
 
         JavaScript::put([
             'nodeData' => $this->nodeRepository->getNodesForServerCreation(),

app/Http/Controllers/Admin/Servers/ServerViewController.php

@@ -11,7 +11,6 @@ use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Pterodactyl\Services\Servers\EnvironmentService;
 use Illuminate\Contracts\View\Factory as ViewFactory;
-use Pterodactyl\Repositories\Eloquent\NestRepository;
 use Pterodactyl\Repositories\Eloquent\NodeRepository;
 use Pterodactyl\Repositories\Eloquent\MountRepository;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
@@ -30,7 +29,6 @@ class ServerViewController extends Controller
         private DatabaseHostRepository $databaseHostRepository,
         private LocationRepository $locationRepository,
         private MountRepository $mountRepository,
-        private NestRepository $nestRepository,
         private NodeRepository $nodeRepository,
         private ServerRepository $repository,
         private EnvironmentService $environmentService,
@@ -75,7 +73,7 @@ class ServerViewController extends Controller
      */
     public function startup(Request $request, Server $server): View
     {
-        $nests = $this->nestRepository->getWithEggs();
+        $nests = Nest::with('eggs.variables')->get();
         $variables = $this->environmentService->handle($server);
 
         $this->plainInject([

app/Http/Controllers/Admin/ServersController.php

@@ -24,7 +24,6 @@ use Pterodactyl\Services\Servers\BuildModificationService;
 use Pterodactyl\Services\Databases\DatabasePasswordService;
 use Pterodactyl\Services\Servers\DetailsModificationService;
 use Pterodactyl\Services\Servers\StartupModificationService;
-use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Repositories\Eloquent\DatabaseHostRepository;
 use Pterodactyl\Services\Databases\DatabaseManagementService;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
@@ -54,7 +53,6 @@ class ServersController extends Controller
         protected ReinstallServerService $reinstallService,
         protected ServerRepositoryInterface $repository,
         protected MountRepository $mountRepository,
-        protected NestRepositoryInterface $nestRepository,
         protected ServerConfigurationStructureService $serverConfigurationStructureService,
         protected StartupModificationService $startupModificationService,
         protected SuspensionService $suspensionService