Merge branch 'next' into main

app/Jobs/DatabaseBackupJob.php

@@ -484,6 +484,11 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
             $fullImageName = $this->getFullImageName();
 
+            $containerExists = instant_remote_process(["docker ps -a -q -f name=backup-of-{$this->backup->uuid}"], $this->server, false);
+            if (filled($containerExists)) {
+                instant_remote_process(["docker rm -f backup-of-{$this->backup->uuid}"], $this->server, false);
+            }
+
             if (isDev()) {
                 if ($this->database->name === 'coolify-db') {
                     $backup_location_from = '/var/lib/docker/volumes/coolify_dev_backups_data/_data/coolify/coolify-db-'.$this->server->ip.$this->backup_file;

app/Livewire/Project/Service/FileStorage.php

@@ -49,7 +49,6 @@ class FileStorage extends Component
             $this->workdir = null;
             $this->fs_path = $this->fileStorage->fs_path;
         }
-        $this->fileStorage->loadStorageOnServer();
     }
 
     public function convertToDirectory()
@@ -68,6 +67,18 @@ class FileStorage extends Component
         }
     }
 
+    public function loadStorageOnServer()
+    {
+        try {
+            $this->fileStorage->loadStorageOnServer();
+            $this->dispatch('success', 'File storage loaded from server.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->dispatch('refreshStorages');
+        }
+    }
+
     public function convertToFile()
     {
         try {

app/Livewire/Server/Proxy/Deploy.php

@@ -65,7 +65,6 @@ class Deploy extends Component
     public function restart()
     {
         try {
-            $this->stop();
             $this->dispatch('checkProxy');
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/SettingsEmail.php

@@ -235,7 +235,7 @@ class SettingsEmail extends Component
                 throw new \Exception('Too many messages sent!');
             }
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 }

app/Models/LocalFileVolume.php

@@ -9,8 +9,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 class LocalFileVolume extends BaseModel
 {
     protected $casts = [
-        'fs_path' => 'encrypted',
-        'mount_path' => 'encrypted',
+        // 'fs_path' => 'encrypted',
+        // 'mount_path' => 'encrypted',
         'content' => 'encrypted',
         'is_directory' => 'boolean',
     ];
@@ -176,4 +176,19 @@ class LocalFileVolume extends BaseModel
 
         return instant_remote_process($commands, $server);
     }
+
+    // Accessor for convenient access
+    protected function plainMountPath(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => $this->mount_path,
+            set: fn ($value) => $this->mount_path = $value
+        );
+    }
+
+    // Scope for searching
+    public function scopeWherePlainMountPath($query, $path)
+    {
+        return $query->get()->where('plain_mount_path', $path);
+    }
 }

app/Notifications/Channels/EmailChannel.php

@@ -2,69 +2,68 @@
 
 namespace App\Notifications\Channels;
 
-use App\Services\ConfigurationRepository;
-use Exception;
-use Illuminate\Mail\Message;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
+use Resend;
 
 class EmailChannel
 {
-    private ConfigurationRepository $configRepository;
-
-    public function __construct(ConfigurationRepository $configRepository)
-    {
-        $this->configRepository = $configRepository;
-    }
+    public function __construct() {}
 
     public function send(SendsEmail $notifiable, Notification $notification): void
     {
-        try {
-            $this->bootConfigs($notifiable);
+        $useInstanceEmailSettings = $notifiable->emailNotificationSettings->use_instance_email_settings;
+        $customEmails = data_get($notification, 'emails', null);
+        if ($useInstanceEmailSettings) {
+            $settings = instanceSettings();
+        } else {
+            $settings = $notifiable->emailNotificationSettings;
+        }
+        $isResendEnabled = $settings->resend_enabled;
+        $isSmtpEnabled = $settings->smtp_enabled;
+        if ($customEmails) {
+            $recipients = [$customEmails];
+        } else {
             $recipients = $notifiable->getRecipients();
-            if (count($recipients) === 0) {
-                throw new Exception('No email recipients found');
-            }
+        }
+        $mailMessage = $notification->toMail($notifiable);
 
-            $mailMessage = $notification->toMail($notifiable);
-            Mail::send(
-                [],
-                [],
-                fn (Message $message) => $message
-                    ->to($recipients)
-                    ->subject($mailMessage->subject)
-                    ->html((string) $mailMessage->render())
+        if ($isResendEnabled) {
+            $resend = Resend::client($settings->resend_api_key);
+            $from = "{$settings->smtp_from_name} <{$settings->smtp_from_address}>";
+            $resend->emails->send([
+                'from' => $from,
+                'to' => $recipients,
+                'subject' => $mailMessage->subject,
+                'html' => (string) $mailMessage->render(),
+            ]);
+        } elseif ($isSmtpEnabled) {
+            $encryption = match (strtolower($settings->smtp_encryption)) {
+                'starttls' => null,
+                'tls' => 'tls',
+                'none' => null,
+                default => null,
+            };
+
+            $transport = new \Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport(
+                $settings->smtp_host,
+                $settings->smtp_port,
+                $encryption
             );
-        } catch (Exception $e) {
-            $error = $e->getMessage();
-            if ($error === 'No email settings found.') {
-                throw $e;
-            }
-            $message = "EmailChannel error: {$e->getMessage()}. Failed to send email to:";
-            if (isset($recipients)) {
-                $message .= implode(', ', $recipients);
-            }
-            if (isset($mailMessage)) {
-                $message .= " with subject: {$mailMessage->subject}";
-            }
-            send_internal_notification($message);
-            throw $e;
+            $transport->setUsername($settings->smtp_username);
+            $transport->setPassword($settings->smtp_password);
+
+            $mailer = new \Symfony\Component\Mailer\Mailer($transport);
+
+            $fromEmail = $settings->smtp_from_address ?? 'noreply@localhost';
+            $fromName = $settings->smtp_from_name ?? 'System';
+            $from = new \Symfony\Component\Mime\Address($fromEmail, $fromName);
+            $email = (new \Symfony\Component\Mime\Email)
+                ->from($from)
+                ->to(...$recipients)
+                ->subject($mailMessage->subject)
+                ->html((string) $mailMessage->render());
+
+            $mailer->send($email);
         }
     }
-
-    private function bootConfigs($notifiable): void
-    {
-        $emailSettings = $notifiable->emailNotificationSettings;
-
-        if ($emailSettings->use_instance_email_settings) {
-            $type = set_transanctional_email_settings();
-            if (blank($type)) {
-                throw new Exception('No email settings found.');
-            }
-
-            return;
-        }
-
-        $this->configRepository->updateMailConfig($emailSettings);
-    }
 }