From 9ca0ee99e9fb09dab711f1a398d0dd544c0d8f16 Mon Sep 17 00:00:00 2001 From: Sabinno Date: Fri, 5 Mar 2021 12:39:47 -0500 Subject: [PATCH 1/4] Fix spelling Changed "other's", implying a single other person's server, to "others'", implying the servers of multiple people. --- resources/scripts/components/dashboard/DashboardContainer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/scripts/components/dashboard/DashboardContainer.tsx b/resources/scripts/components/dashboard/DashboardContainer.tsx index 2edc06056..72357fd65 100644 --- a/resources/scripts/components/dashboard/DashboardContainer.tsx +++ b/resources/scripts/components/dashboard/DashboardContainer.tsx @@ -35,7 +35,7 @@ export default () => { {rootAdmin &&

- {showOnlyAdmin ? 'Showing other\'s servers' : 'Showing your servers'} + {showOnlyAdmin ? 'Showing others\' servers' : 'Showing your servers'}

Date: Sat, 6 Mar 2021 15:52:24 +0800 Subject: [PATCH 2/4] Update ServerInstallController.php --- .../Remote/Servers/ServerInstallController.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php b/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php index 113b7c01e..fc3e04b72 100644 --- a/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php +++ b/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php @@ -9,6 +9,8 @@ use Illuminate\Http\JsonResponse; use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Repositories\Eloquent\ServerRepository; use Pterodactyl\Http\Requests\Api\Remote\InstallationDataRequest; +use Pterodactyl\Events\Server\Installed as ServerInstalled; +use Illuminate\Contracts\Events\Dispatcher as EventDispatcher; class ServerInstallController extends Controller { @@ -17,12 +19,18 @@ class ServerInstallController extends Controller */ private $repository; + /** + * @var \Illuminate\Contracts\Events\Dispatcher + */ + private $eventDispatcher; + /** * ServerInstallController constructor. */ - public function __construct(ServerRepository $repository) + public function __construct(ServerRepository $repository, EventDispatcher $eventDispatcher) { $this->repository = $repository; + $this->eventDispatcher = $eventDispatcher; } /** @@ -63,6 +71,11 @@ class ServerInstallController extends Controller $this->repository->update($server->id, ['status' => $status], true, true); + // If the server successfully installed, fire installed event. + if ($status === null) { + $this->eventDispatcher->dispatch(new ServerInstalled($server)); + } + return new JsonResponse([], Response::HTTP_NO_CONTENT); } } From ca6068fa6d38219bb5385584a94446d515f4a3a2 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 6 Mar 2021 10:49:08 -0800 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbbdd24f0..81bb1d5a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. * Fixes server console resize handler to no longer encounter an exception at random that breaks the entire UI. * Fixes unhandled error caused by entering an invalid IP address or FQDN when creating a new node allocation. * Fixes unhandled error when Wings would fetch a server configuration from the Panel that uses an Egg with invalid JSON data for the configuration fields. +* Fixes email not being sent to a user when their server is done installing. ### Added * Adds support for automatically copying SFTP connection details when clicking into the text field. From 0baa74a51737ea70e90cb624c320dc9957db020d Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 6 Mar 2021 12:29:40 -0800 Subject: [PATCH 4/4] Fix rust not seeding --- database/Seeders/eggs/rust/egg-rust.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/Seeders/eggs/rust/egg-rust.json b/database/Seeders/eggs/rust/egg-rust.json index 2fef9efda..00523ac17 100644 --- a/database/Seeders/eggs/rust/egg-rust.json +++ b/database/Seeders/eggs/rust/egg-rust.json @@ -121,7 +121,7 @@ "default_value": "CHANGEME", "user_viewable": true, "user_editable": true, - "rules": "required|regex:/^[\w.-]*$/|max:64" + "rules": "required|regex:/^[\\w.-]*$/|max:64" }, { "name": "Save Interval",