From 2ed7f1c9121c8288bd877346230585b241e6b189 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Tue, 17 Jan 2023 23:01:53 +0100 Subject: [PATCH 1/4] Fix `MAIL_FROM_ADDRESS` in EmailSettingsCommand (#4648) --- app/Console/Commands/Environment/EmailSettingsCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/Environment/EmailSettingsCommand.php b/app/Console/Commands/Environment/EmailSettingsCommand.php index cffb03a6b..d5efbc90a 100644 --- a/app/Console/Commands/Environment/EmailSettingsCommand.php +++ b/app/Console/Commands/Environment/EmailSettingsCommand.php @@ -57,7 +57,7 @@ class EmailSettingsCommand extends Command $this->{$method}(); } - $this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask( + $this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask( trans('command/messages.environment.mail.ask_mail_from'), $this->config->get('mail.from.address') ); From dd595437e68bd34389e5e8362c94f196fbb6ee9d Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Tue, 17 Jan 2023 15:06:56 -0700 Subject: [PATCH 2/4] Update README.md, fix CI status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a022fc07..c4f0ec593 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io) -![GitHub Workflow Status](https://img.shields.io/github/workflow/status/pterodactyl/panel/tests?label=Tests&style=for-the-badge) +![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pterodactyl/panel/ci.yaml?label=Tests&style=for-the-badge&branch=1.0-develop) ![Discord](https://img.shields.io/discord/122900397965705216?label=Discord&logo=Discord&logoColor=white&style=for-the-badge) ![GitHub Releases](https://img.shields.io/github/downloads/pterodactyl/panel/latest/total?style=for-the-badge) ![GitHub contributors](https://img.shields.io/github/contributors/pterodactyl/panel?style=for-the-badge) From c74314d2ab344a5771c753d3f786e9afabb1c1bb Mon Sep 17 00:00:00 2001 From: Jelco <53396500+Jelcoo@users.noreply.github.com> Date: Tue, 17 Jan 2023 23:12:22 +0100 Subject: [PATCH 3/4] Fix file repository not catching 404 responses (#4637) --- app/Repositories/Wings/DaemonFileRepository.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Repositories/Wings/DaemonFileRepository.php b/app/Repositories/Wings/DaemonFileRepository.php index 77949478f..ca757151e 100644 --- a/app/Repositories/Wings/DaemonFileRepository.php +++ b/app/Repositories/Wings/DaemonFileRepository.php @@ -6,6 +6,7 @@ use Illuminate\Support\Arr; use Webmozart\Assert\Assert; use Pterodactyl\Models\Server; use Psr\Http\Message\ResponseInterface; +use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\TransferException; use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException; use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException; @@ -32,7 +33,7 @@ class DaemonFileRepository extends DaemonRepository 'query' => ['file' => $path], ] ); - } catch (TransferException $exception) { + } catch (ClientException|TransferException $exception) { throw new DaemonConnectionException($exception); } From fbdac5b63f4222588c0ba8cfe85ffca38872daf1 Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Tue, 17 Jan 2023 15:21:31 -0700 Subject: [PATCH 4/4] ui(server): fix `reinstall_failed` conflict state --- resources/scripts/api/server/types.d.ts | 8 +++++++- .../scripts/components/server/ConflictStateRenderer.tsx | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/resources/scripts/api/server/types.d.ts b/resources/scripts/api/server/types.d.ts index 7e3e540c0..0816d7e81 100644 --- a/resources/scripts/api/server/types.d.ts +++ b/resources/scripts/api/server/types.d.ts @@ -1,4 +1,10 @@ -export type ServerStatus = 'installing' | 'install_failed' | 'suspended' | 'restoring_backup' | null; +export type ServerStatus = + | 'installing' + | 'install_failed' + | 'reinstall_failed' + | 'suspended' + | 'restoring_backup' + | null; export interface ServerBackup { uuid: string; diff --git a/resources/scripts/components/server/ConflictStateRenderer.tsx b/resources/scripts/components/server/ConflictStateRenderer.tsx index 95e70bbaa..d090b731c 100644 --- a/resources/scripts/components/server/ConflictStateRenderer.tsx +++ b/resources/scripts/components/server/ConflictStateRenderer.tsx @@ -12,7 +12,7 @@ export default () => { (state) => state.server.data?.isNodeUnderMaintenance || false ); - return status === 'installing' || status === 'install_failed' ? ( + return status === 'installing' || status === 'install_failed' || status === 'reinstall_failed' ? ( { image={ServerRestoreSvg} message={ isTransferring - ? 'Your server is being transfered to a new node, please check back later.' + ? 'Your server is being transferred to a new node, please check back later.' : 'Your server is currently being restored from a backup, please check back in a few minutes.' } />