Skip to content

[Fix] Hardcoded MailAttachment model should be replaced by config #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Baspa merged 5 commits into from
May 19, 2025
+5 −5
Merged

[Fix] Hardcoded MailAttachment model should be replaced by config #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b30afaa
Use the MailAttachment model from the mails config
Baspa May 19, 2025
3d05e9f
Fix styling
Baspa May 19, 2025
96eca05
Remove non existing path check
Baspa May 19, 2025
6bd4b95
Merge branch '42-bug-hardcode-appmodelsmailattachment-model-is-used-i…
Baspa May 19, 2025
2d440b2
Fix undefined property
Baspa May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ parameters:
paths:
- src
- config
- database
tmpDir: build/phpstan
checkOctaneCompatibility: true
checkModelProperties: true
7 changes: 4 additions & 3 deletions src/Controllers/MailDownloadController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace Vormkracht10\FilamentMails\Controllers;

use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Storage;
use Vormkracht10\Mails\Models\MailAttachment;

class MailDownloadController extends Controller
{
Expand All @@ -17,8 +17,9 @@ public function __invoke(...$arguments)
$tenant = null;
}

/** @var MailAttachment $attachment */
$attachment = MailAttachment::find($attachment);
$attachmentModel = Config::get('mails.models.attachment');
/** @var \Vormkracht10\Mails\Models\MailAttachment $attachment */
$attachment = $attachmentModel::find($attachment);

$file = Storage::disk($attachment->disk)->path($attachment->storagePath);

Expand Down
2 changes: 1 addition & 1 deletion src/Resources/SuppressionResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static function table(Table $table): Table
Tables\Actions\Action::make('unsuppress')
->label(__('Unsuppress'))
->action(function (MailEvent $record) {
event(new MailUnsuppressed(key($record->to), $record->mail->mailer == 'smtp' && filled($record->mail->transport) ? $record->mail->transport : $record->mail->mailer, $record->mail->stream_id ?? null));
event(new MailUnsuppressed(key($record->mail->to), $record->mail->mailer == 'smtp' && filled($record->mail->transport) ? $record->mail->transport : $record->mail->mailer, $record->mail->stream_id ?? null));
})
->visible(fn ($record) => Provider::tryFrom($record->mail->mailer == 'smtp' && filled($record->mail->transport) ? $record->mail->transport : $record->mail->mailer)),

Expand Down