Misc fixes

Author: DaneEveritt

app/Http/Controllers/API/Remote/EggRetrievalController.php

@@ -47,11 +47,11 @@ public function __construct(
      */
     public function index(): JsonResponse
     {
-        $options = $this->repository->getAllWithCopyAttributes();
+        $eggs = $this->repository->getAllWithCopyAttributes();
 
         $response = [];
-        $options->each(function ($option) use (&$response) {
-            $response[$option->uuid] = sha1(json_encode($this->configurationFileService->handle($option)));
+        $eggs->each(function ($egg) use (&$response) {
+            $response[$egg->uuid] = sha1(json_encode($this->configurationFileService->handle($egg)));
         });
 
         return response()->json($response);

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

@@ -11,14 +11,20 @@
 
 use Pterodactyl\Models\Egg;
 use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
 use Pterodactyl\Http\Controllers\Controller;
 use Symfony\Component\HttpFoundation\Response;
 use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
 use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
-use Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest;
+use Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest;
 
 class EggShareController extends Controller
 {
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    protected $alert;
+
     /**
      * @var \Pterodactyl\Services\Eggs\Sharing\EggExporterService
      */
@@ -32,13 +38,16 @@ class EggShareController extends Controller
     /**
      * OptionShareController constructor.
      *
+     * @param \Prologue\Alerts\AlertsMessageBag                     $alert
      * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService $exporterService
      * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService $importerService
      */
     public function __construct(
+        AlertsMessageBag $alert,
         EggExporterService $exporterService,
         EggImporterService $importerService
     ) {
+        $this->alert = $alert;
         $this->exporterService = $exporterService;
         $this->importerService = $importerService;
     }
@@ -62,16 +71,17 @@ public function export(Egg $egg): Response
     /**
      * Import a new service option using an XML file.
      *
-     * @param \Pterodactyl\Http\Requests\Admin\Service\OptionImportFormRequest $request
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
      */
-    public function import(OptionImportFormRequest $request): RedirectResponse
+    public function import(EggImportFormRequest $request): RedirectResponse
     {
         $egg = $this->importerService->handle($request->file('import_file'), $request->input('import_to_nest'));
+        $this->alert->success(trans('admin/nests.eggs.notices.imported'))->flash();
 
         return redirect()->route('admin.nests.egg.view', ['egg' => $egg->id]);
     }

…dmin/Service/OptionImportFormRequest.php …uests/Admin/Egg/EggImportFormRequest.phpapp/Http/Requests/Admin/Service/OptionImportFormRequest.php renamed to app/Http/Requests/Admin/Egg/EggImportFormRequest.php app/Http/Requests/Admin/Service/OptionImportFormRequest.php renamed to app/Http/Requests/Admin/Egg/EggImportFormRequest.php

@@ -7,11 +7,11 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Http\Requests\Admin\Service;
+namespace Pterodactyl\Http\Requests\Admin\Egg;
 
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class OptionImportFormRequest extends AdminFormRequest
+class EggImportFormRequest extends AdminFormRequest
 {
     /**
      * @return array
@@ -20,7 +20,7 @@ public function rules()
     {
         return [
             'import_file' => 'bail|required|file|max:1000|mimetypes:application/json,text/plain',
-            'import_to_service' => 'bail|required|integer|exists:services,id',
+            'import_to_nest' => 'bail|required|integer|exists:nests,id',
         ];
     }
 }

app/Http/Requests/Admin/Service/ServiceFunctionsFormRequest.php

@@ -65,8 +65,10 @@ class Egg extends Model implements CleansAttributes, ValidableContract
      */
     protected static $applicationRules = [
         'nest_id' => 'required',
+        'uuid' => 'required',
         'name' => 'required',
         'description' => 'required',
+        'author' => 'required',
         'docker_image' => 'required',
         'startup' => 'required',
         'config_from' => 'sometimes',
@@ -84,6 +86,7 @@ class Egg extends Model implements CleansAttributes, ValidableContract
         'uuid' => 'string|size:36',
         'name' => 'string|max:255',
         'description' => 'string',
+        'author' => 'string|email',
         'docker_image' => 'string|max:255',
         'startup' => 'nullable|string',
         'config_from' => 'bail|nullable|numeric|exists:eggs,id',

app/Models/Egg.php

@@ -49,7 +49,7 @@ class Nest extends Model implements CleansAttributes, ValidableContract
      * @var array
      */
     protected static $dataIntegrityRules = [
-        'author' => 'email',
+        'author' => 'string|email',
         'name' => 'string|max:255',
         'description' => 'nullable|string',
     ];

app/Models/Nest.php

@@ -32,22 +32,22 @@ public function __construct(EggRepositoryInterface $repository)
     /**
      * Return an Egg file to be used by the Daemon.
      *
-     * @param int|\Pterodactyl\Models\Egg $option
+     * @param int|\Pterodactyl\Models\Egg $egg
      * @return array
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle($option): array
+    public function handle($egg): array
     {
-        if (! $option instanceof Egg) {
-            $option = $this->repository->getWithCopyAttributes($option);
+        if (! $egg instanceof Egg) {
+            $egg = $this->repository->getWithCopyAttributes($egg);
         }
 
         return [
-            'startup' => json_decode($option->inherit_config_startup),
-            'stop' => $option->inherit_config_stop,
-            'configs' => json_decode($option->inherit_config_files),
-            'log' => json_decode($option->inherit_config_logs),
+            'startup' => json_decode($egg->inherit_config_startup),
+            'stop' => $egg->inherit_config_stop,
+            'configs' => json_decode($egg->inherit_config_files),
+            'log' => json_decode($egg->inherit_config_logs),
             'query' => 'none',
         ];
     }

app/Services/Eggs/EggConfigurationService.php

@@ -51,6 +51,7 @@ public function handle(int $egg): string
             'author' => $egg->author,
             'description' => $egg->description,
             'image' => $egg->docker_image,
+            'startup' => $egg->startup,
             'config' => [
                 'files' => $egg->inherit_config_files,
                 'startup' => $egg->inherit_config_startup,

app/Services/Eggs/Sharing/EggExporterService.php

@@ -89,6 +89,7 @@ public function handle(UploadedFile $file, int $nest): Egg
         $egg = $this->repository->create([
             'uuid' => Uuid::uuid4()->toString(),
             'nest_id' => $nest->id,
+            'author' => object_get($parsed, 'author'),
             'name' => object_get($parsed, 'name'),
             'description' => object_get($parsed, 'description'),
             'docker_image' => object_get($parsed, 'image'),

app/Services/Eggs/Sharing/EggImporterService.php

@@ -72,7 +72,7 @@ public function handle($server): array
             ],
             'keys' => [],
             'service' => [
-                'option' => $server->option->uuid,
+                'egg' => $server->egg->uuid,
                 'pack' => object_get($server, 'pack.uuid'),
                 'skip_scripts' => $server->skip_scripts,
             ],