Remove unnecessary nullsafe operator on left side of ??

Add a timezone dropdown (defaulting to the user's profile timezone) to the schedule form so cron inputs are interpreted in the chosen timezone. The selected timezone is used to compute next_run_at in UTC at save time with no database schema changes required.

Resolves #1228

app/Filament/Admin/Resources/Servers/Pages/EditServer.php

@@ -30,7 +30,6 @@ use App\Traits\Filament\CanCustomizeTabs;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
@@ -1107,13 +1106,9 @@ class EditServer extends EditRecord
                 ->modalHeading(trans('filament-actions::delete.single.modal.heading', ['label' => $this->getRecordTitle()]))
                 ->modalSubmitActionLabel(trans('filament-actions::delete.single.label'))
                 ->requiresConfirmation()
-                ->form(fn (Server $server) => $server->backups()->where('is_locked', false)->exists() ? [
-                    Checkbox::make('delete_backups')
-                        ->label(trans('admin/server.delete_backups', ['count' => $server->backups()->where('is_locked', false)->count()])),
-                ] : [])
-                ->action(function (array $data, Server $server, ServerDeletionService $service) {
+                ->action(function (Server $server, ServerDeletionService $service) {
                     try {
-                        $service->withDeleteBackups($data['delete_backups'] ?? false)->handle($server);
+                        $service->handle($server);
 
                         return redirect(ListServers::getUrl(panel: 'admin'));
                     } catch (ConnectionException) {
@@ -1137,13 +1132,9 @@ class EditServer extends EditRecord
                 ->modalHeading(trans('filament-actions::force-delete.single.modal.heading', ['label' => $this->getRecordTitle()]))
                 ->modalSubmitActionLabel(trans('filament-actions::force-delete.single.label'))
                 ->requiresConfirmation()
-                ->form(fn (Server $server) => $server->backups()->where('is_locked', false)->exists() ? [
-                    Checkbox::make('delete_backups')
-                        ->label(trans('admin/server.delete_backups', ['count' => $server->backups()->where('is_locked', false)->count()])),
-                ] : [])
-                ->action(function (array $data, Server $server, ServerDeletionService $service) {
+                ->action(function (Server $server, ServerDeletionService $service) {
                     try {
-                        $service->withForce()->withDeleteBackups($data['delete_backups'] ?? false)->handle($server);
+                        $service->withForce()->handle($server);
 
                         return redirect(ListServers::getUrl(panel: 'admin'));
                     } catch (ConnectionException) {

app/Filament/Server/Pages/Console.php

@@ -78,15 +78,11 @@ class Console extends Page
         $feature = data_get($data, 'key');
 
         $feature = $this->featureService->get($feature);
-        if (!$feature) {
+        if (!$feature || $this->getMountedAction()) {
             return;
         }
-
-        if ($this->getMountedAction()) {
-            $this->replaceMountedAction($feature->getId());
-        } else {
-            $this->mountAction($feature->getId());
-        }
+        $this->mountAction($feature->getId());
+        sleep(2); // TODO find a better way
     }
 
     public function getWidgetData(): array

app/Filament/Server/Resources/Files/Pages/ListFiles.php

@@ -209,18 +209,16 @@ class ListFiles extends ListRecords
                                 ->required()
                                 ->live(),
                             TextEntry::make('new_location')
-                                ->state(fn (Get $get, File $file) => resolve_path(join_paths($this->path, str_ends_with($get('location') ?? '/', '/') ? join_paths($get('location') ?? '/', $file->name) : $get('location') ?? '/'))),
+                                ->state(fn (Get $get, File $file) => resolve_path(join_paths($this->path, $get('location') ?? '/', $file->name))),
                         ])
                         ->action(function ($data, File $file) {
                             $location = $data['location'];
-                            $endsWithSlash = str_ends_with($location, '/');
-                            $to = $endsWithSlash ? join_paths($location, $file->name) : $location;
-                            $files = [['to' => $to, 'from' => $file->name]];
+                            $files = [['to' => join_paths($location, $file->name), 'from' => $file->name]];
 
                             $this->getDaemonFileRepository()->renameFiles($this->path, $files);
 
                             $oldLocation = join_paths($this->path, $file->name);
-                            $newLocation = resolve_path(join_paths($this->path, $to));
+                            $newLocation = resolve_path(join_paths($this->path, $location, $file->name));
 
                             Activity::event('server:file.rename')
                                 ->property('directory', $this->path)

app/Filament/Server/Resources/Schedules/Pages/CreateSchedule.php

@@ -39,13 +39,17 @@ class CreateSchedule extends CreateRecord
             $data['server_id'] = $server->id;
         }
 
+        $timezone = $data['timezone'] ?? user()->timezone ?? 'UTC';
+        unset($data['timezone']);
+
         if (!isset($data['next_run_at'])) {
             $data['next_run_at'] = ScheduleResource::getNextRun(
                 $data['cron_minute'],
                 $data['cron_hour'],
                 $data['cron_day_of_month'],
                 $data['cron_month'],
-                $data['cron_day_of_week']
+                $data['cron_day_of_week'],
+                $timezone
             );
         }
 

app/Filament/Server/Resources/Schedules/Pages/EditSchedule.php

@@ -37,12 +37,16 @@ class EditSchedule extends EditRecord
 
     protected function mutateFormDataBeforeSave(array $data): array
     {
+        $timezone = $data['timezone'] ?? user()->timezone ?? 'UTC';
+        unset($data['timezone']);
+
         $data['next_run_at'] = ScheduleResource::getNextRun(
             $data['cron_minute'],
             $data['cron_hour'],
             $data['cron_day_of_month'],
             $data['cron_month'],
-            $data['cron_day_of_week']
+            $data['cron_day_of_week'],
+            $timezone
         );
 
         return $data;

app/Filament/Server/Resources/Schedules/ScheduleResource.php

@@ -100,13 +100,15 @@ class ScheduleResource extends Resource
                 Section::make('Cron')
                     ->label(trans('server/schedule.cron'))
                     ->description(function (Get $get) {
+                        $timezone = $get('timezone') ?? user()->timezone ?? 'UTC';
+
                         try {
-                            $nextRun = Utilities::getScheduleNextRunDate($get('cron_minute'), $get('cron_hour'), $get('cron_day_of_month'), $get('cron_month'), $get('cron_day_of_week'))->timezone(user()->timezone ?? 'UTC');
+                            $nextRun = Utilities::getScheduleNextRunDate($get('cron_minute'), $get('cron_hour'), $get('cron_day_of_month'), $get('cron_month'), $get('cron_day_of_week'), $timezone)->timezone($timezone);
                         } catch (Exception) {
                             $nextRun = trans('server/schedule.invalid');
                         }
 
-                        return new HtmlString(trans('server/schedule.cron_body') . '<br>' . trans('server/schedule.cron_timezone', ['timezone' => user()->timezone ?? 'UTC', 'next_run' => $nextRun]));
+                        return new HtmlString(trans('server/schedule.cron_body', ['timezone' => $timezone]) . '<br>' . trans('server/schedule.cron_timezone', ['timezone' => $timezone, 'next_run' => $nextRun]));
                     })
                     ->schema([
                         Actions::make([
@@ -295,6 +297,13 @@ class ScheduleResource extends Resource
                                 'default' => 4,
                                 'lg' => 5,
                             ]),
+                        Select::make('timezone')
+                            ->label(trans('server/schedule.timezone'))
+                            ->options(fn () => array_combine(timezone_identifiers_list(), timezone_identifiers_list()))
+                            ->default(user()->timezone ?? 'UTC')
+                            ->searchable()
+                            ->live()
+                            ->hiddenOn('view'),
                     ])
                     ->columnSpanFull(),
             ]);
@@ -379,10 +388,10 @@ class ScheduleResource extends Resource
         ];
     }
 
-    public static function getNextRun(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek): Carbon
+    public static function getNextRun(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek, string $timezone = 'UTC'): Carbon
     {
         try {
-            return Utilities::getScheduleNextRunDate($minute, $hour, $dayOfMonth, $month, $dayOfWeek);
+            return Utilities::getScheduleNextRunDate($minute, $hour, $dayOfMonth, $month, $dayOfWeek, $timezone);
         } catch (Exception) {
             Notification::make()
                 ->title(trans('server/schedule.notification_invalid_cron'))

app/Helpers/Utilities.php

@@ -38,11 +38,11 @@ class Utilities
      *
      * @throws Exception
      */
-    public static function getScheduleNextRunDate(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek): Carbon
+    public static function getScheduleNextRunDate(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek, string $timezone = 'UTC'): Carbon
     {
         return Carbon::instance((new CronExpression(
             sprintf('%s %s %s %s %s', $minute, $hour, $dayOfMonth, $month, $dayOfWeek)
-        ))->getNextRunDate(now('UTC')));
+        ))->getNextRunDate(now($timezone)))->setTimezone('UTC');
     }
 
     public static function checked(string $name, mixed $default): string

app/Http/Controllers/Api/Client/Servers/ScheduleController.php

@@ -75,7 +75,7 @@ class ScheduleController extends ClientApiController
             'cron_minute' => $request->input('minute'),
             'is_active' => (bool) $request->input('is_active'),
             'only_when_online' => (bool) $request->input('only_when_online'),
-            'next_run_at' => $this->getNextRunAt($request),
+            'next_run_at' => $this->getNextRunAt($request, $request->user()->timezone ?? 'UTC'),
         ]);
 
         Activity::event('server:schedule.create')
@@ -131,7 +131,7 @@ class ScheduleController extends ClientApiController
             'cron_minute' => $request->input('minute'),
             'is_active' => $active,
             'only_when_online' => (bool) $request->input('only_when_online'),
-            'next_run_at' => $this->getNextRunAt($request),
+            'next_run_at' => $this->getNextRunAt($request, $request->user()->timezone ?? 'UTC'),
         ];
 
         // Toggle the processing state of the scheduled task when it is enabled or disabled so that an
@@ -188,7 +188,7 @@ class ScheduleController extends ClientApiController
      *
      * @throws DisplayException
      */
-    protected function getNextRunAt(Request $request): Carbon
+    protected function getNextRunAt(Request $request, string $timezone = 'UTC'): Carbon
     {
         try {
             return Utilities::getScheduleNextRunDate(
@@ -196,7 +196,8 @@ class ScheduleController extends ClientApiController
                 $request->input('hour'),
                 $request->input('day_of_month'),
                 $request->input('month'),
-                $request->input('day_of_week')
+                $request->input('day_of_week'),
+                $timezone
             );
         } catch (Exception) {
             throw new DisplayException('The cron data provided does not evaluate to a valid expression.');

app/Http/Controllers/Auth/OAuthController.php

@@ -74,7 +74,7 @@ class OAuthController extends Controller
         $email = $oauthUser->getEmail();
 
         if (!$email) {
-            return $this->errorRedirect('No email was linked to your account on the OAuth provider.');
+            return $this->errorRedirect();
         }
 
         $user = User::whereEmail($email)->first();

app/Models/Node.php

@@ -358,7 +358,7 @@ class Node extends Model implements Validatable
             'disk_used' => 0,
         ];
 
-        return cache()->flexible("nodes.$this->id.statistics", [5, 30], function () use ($default) {
+        return cache()->remember("nodes.$this->id.statistics", now()->addSeconds(360), function () use ($default) {
             try {
 
                 $data = Http::daemon($this)

app/Services/Servers/ServerDeletionService.php

@@ -5,7 +5,6 @@ namespace App\Services\Servers;
 use App\Exceptions\DisplayException;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonServerRepository;
-use App\Services\Backups\DeleteBackupService;
 use App\Services\Databases\DatabaseManagementService;
 use Exception;
 use Illuminate\Database\ConnectionInterface;
@@ -17,16 +16,13 @@ class ServerDeletionService
 {
     protected bool $force = false;
 
-    protected bool $deleteBackups = false;
-
     /**
      * ServerDeletionService constructor.
      */
     public function __construct(
         private ConnectionInterface $connection,
         private DaemonServerRepository $daemonServerRepository,
-        private DatabaseManagementService $databaseManagementService,
-        private DeleteBackupService $deleteBackupService
+        private DatabaseManagementService $databaseManagementService
     ) {}
 
     /**
@@ -39,16 +35,6 @@ class ServerDeletionService
         return $this;
     }
 
-    /**
-     * Set if unlocked backups should be deleted from storage when the server is deleted.
-     */
-    public function withDeleteBackups(bool $bool = true): self
-    {
-        $this->deleteBackups = $bool;
-
-        return $this;
-    }
-
     /**
      * Delete a server from the panel and remove any associated databases from hosts.
      *
@@ -92,22 +78,6 @@ class ServerDeletionService
                 }
             }
 
-            if ($this->deleteBackups) {
-                foreach ($server->backups()->where('is_locked', false)->get() as $backup) {
-                    try {
-                        $this->deleteBackupService->handle($backup);
-                    } catch (Exception $exception) {
-                        if (!$this->force) {
-                            throw $exception;
-                        }
-
-                        $backup->delete();
-
-                        logger()->warning($exception);
-                    }
-                }
-            }
-
             $server->allocations()->update([
                 'server_id' => null,
                 'notes' => null,

lang/en/admin/server.php

@@ -98,7 +98,6 @@ return [
     'delete_db' => 'Are you sure you want to delete :name ?',
     'delete_db_heading' => 'Delete Database?',
     'backups' => 'Backups',
-    'delete_backups' => 'Also delete :count backup(s) from storage',
     'egg' => 'Egg',
     'mounts' => 'Mounts',
     'no_mounts' => 'No Mounts exist for this Node',

lang/en/server/schedule.php

@@ -29,7 +29,8 @@ return [
     'enabled' => 'Enable Schedule?',
     'enabled_hint' => 'This schedule will be executed automatically if enabled.',
 
-    'cron_body' => 'Please keep in mind that the cron inputs below always assume UTC.',
+    'timezone' => 'Timezone',
+    'cron_body' => 'The cron inputs below use your timezone (:timezone).',
     'cron_timezone' => 'Next run in your timezone (:timezone): <b> :next_run </b>',
 
     'invalid' => 'Invalid',

public/.htaccess

@@ -5,10 +5,6 @@
 
     RewriteEngine On
 
-    # Handle X-Forwarded-Proto Header
-    RewriteCond %{HTTP:X-Forwarded-Proto} =https [NC]
-    RewriteRule .* - [E=HTTPS:on]
-
     # Handle Authorization Header
     RewriteCond %{HTTP:Authorization} .
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]