dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "rector: arrrrr"

Browse Source 
This reverts commit 16c0cd10d8.
This commit is contained in:
Andras Bacsai
2025-01-07 15:31:43 +01:00
parent da07b4fdcf
commit 1fe4dd722b
349 changed files with 3689 additions and 4184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Models/S3Storage.php
View File

@@ -5,7 +5,6 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Support\Facades\Storage;
use Throwable;
class S3Storage extends BaseModel
{
@@ -13,6 +12,12 @@ class S3Storage extends BaseModel
protected $guarded = [];
protected $casts = [
'is_usable' => 'boolean',
'key' => 'encrypted',
'secret' => 'encrypted',
];
public static function ownedByCurrentTeam(array $select = ['*'])
{
$selectArray = collect($select)->concat(['id']);
@@ -52,12 +57,12 @@ class S3Storage extends BaseModel
Storage::disk('custom-s3')->files();
$this->unusable_email_sent = false;
$this->is_usable = true;
} catch (Throwable $e) {
} catch (\Throwable $e) {
$this->is_usable = false;
if ($this->unusable_email_sent === false && is_transactional_emails_enabled()) {
$mailMessage = new MailMessage;
$mailMessage->subject('Coolify: S3 Storage Connection Error');
$mailMessage->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('storage.show', ['storage_uuid' => $this->uuid])]);
$mail = new MailMessage;
$mail->subject('Coolify: S3 Storage Connection Error');
$mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('storage.show', ['storage_uuid' => $this->uuid])]);
$users = collect([]);
$members = $this->team->members()->get();
foreach ($members as $user) {
@@ -66,7 +71,7 @@ class S3Storage extends BaseModel
}
}
foreach ($users as $user) {
send_user_an_email($mailMessage, $user->email);
send_user_an_email($mail, $user->email);
}
$this->unusable_email_sent = true;
}
@@ -78,13 +83,4 @@ class S3Storage extends BaseModel
}
}
}
protected function casts(): array
{
return [
'is_usable' => 'boolean',
'key' => 'encrypted',
'secret' => 'encrypted',
];
}
}