Insane number of changes required to get the build to post

Author: DaneEveritt

app/Repositories/Wings/DaemonServerRepository.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Repositories\Wings;
 
+use BadMethodCallException;
 use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\TransferException;
@@ -69,4 +70,30 @@ public function update(array $data): void
             throw new DaemonConnectionException($exception);
         }
     }
+
+    /**
+     * Delete a server from the daemon.
+     */
+    public function delete(): void
+    {
+        throw new BadMethodCallException('Method is not implemented.');
+    }
+
+    /**
+     * Reinstall a server on the daemon.
+     */
+    public function reinstall(): void
+    {
+        throw new BadMethodCallException('Method is not implemented.');
+    }
+
+    public function suspend(): void
+    {
+        throw new BadMethodCallException('Method is not implemented.');
+    }
+
+    public function unsuspend(): void
+    {
+        throw new BadMethodCallException('Method is not implemented.');
+    }
 }

app/Services/DaemonKeys/DaemonKeyDeletionService.php

@@ -4,28 +4,30 @@
 
 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;
 
 class ContainerRebuildService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
     private $repository;
 
     /**
      * ContainerRebuildService constructor.
      *
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $repository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $repository
      */
-    public function __construct(ServerRepositoryInterface $repository)
+    public function __construct(DaemonServerRepository $repository)
     {
         $this->repository = $repository;
     }
 
     /**
-     * Mark a server for rebuild on next boot cycle.
+     * Mark a server for rebuild on next boot cycle. This just makes an empty patch
+     * request to Wings which will automatically mark the container as requiring a rebuild
+     * on the next boot as a result.
      *
      * @param \Pterodactyl\Models\Server $server
      *
@@ -34,7 +36,7 @@ public function __construct(ServerRepositoryInterface $repository)
     public function handle(Server $server)
     {
         try {
-            $this->repository->setServer($server)->rebuild();
+            $this->repository->setServer($server)->update([]);
         } catch (RequestException $exception) {
             throw new DaemonConnectionException($exception);
         }

app/Services/Servers/ContainerRebuildService.php

@@ -6,8 +6,6 @@
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Traits\Services\ReturnsUpdatedModels;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
-use Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService;
-use Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService;
 
 class DetailsModificationService
 {
@@ -18,16 +16,6 @@ class DetailsModificationService
      */
     private $connection;
 
-    /**
-     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService
-     */
-    private $keyCreationService;
-
-    /**
-     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService
-     */
-    private $keyDeletionService;
-
     /**
      * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
      */
@@ -37,19 +25,13 @@ class DetailsModificationService
      * DetailsModificationService constructor.
      *
      * @param \Illuminate\Database\ConnectionInterface $connection
-     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService $keyCreationService
-     * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService $keyDeletionService
      * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
      */
     public function __construct(
         ConnectionInterface $connection,
-        DaemonKeyCreationService $keyCreationService,
-        DaemonKeyDeletionService $keyDeletionService,
         ServerRepository $repository
     ) {
         $this->connection = $connection;
-        $this->keyCreationService = $keyCreationService;
-        $this->keyDeletionService = $keyDeletionService;
         $this->repository = $repository;
     }
 
@@ -60,7 +42,6 @@ public function __construct(
      * @param array $data
      * @return bool|\Pterodactyl\Models\Server
      *
-     * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
@@ -75,11 +56,6 @@ public function handle(Server $server, array $data)
             'description' => array_get($data, 'description') ?? '',
         ], true, true);
 
-        if ((int) array_get($data, 'owner_id', 0) !== (int) $server->owner_id) {
-            $this->keyDeletionService->handle($server, $server->owner_id);
-            $this->keyCreationService->handle($server->id, array_get($data, 'owner_id'));
-        }
-
         $this->connection->commit();
 
         return $response;

app/Services/Servers/DetailsModificationService.php

@@ -1,48 +1,41 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Services\Servers;
 
 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
-use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class ReinstallServerService
 {
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
-    protected $daemonServerRepository;
+    private $daemonServerRepository;
 
     /**
      * @var \Illuminate\Database\ConnectionInterface
      */
-    protected $database;
+    private $database;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
      */
-    protected $repository;
+    private $repository;
 
     /**
      * ReinstallService constructor.
      *
      * @param \Illuminate\Database\ConnectionInterface $database
-     * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface $daemonServerRepository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
      */
     public function __construct(
         ConnectionInterface $database,
-        DaemonServerRepositoryInterface $daemonServerRepository,
+        DaemonServerRepository $daemonServerRepository,
         ServerRepositoryInterface $repository
     ) {
         $this->daemonServerRepository = $daemonServerRepository;