From 22b0071480a44fce4bc84e6504dbd1bc1978d2e0 Mon Sep 17 00:00:00 2001 From: Stevy Endaman Date: Sun, 10 Nov 2024 02:01:52 +0100 Subject: [PATCH 1/2] fix: (LAR-109) fix text echappment in the email --- composer.lock | 26 +++++++++---------- resources/views/emails/new_reply.blade.php | 7 +++-- .../views/vendor/mail/html/layout.blade.php | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 91de0c3f..f427dae9 100644 --- a/composer.lock +++ b/composer.lock @@ -10575,16 +10575,16 @@ }, { "name": "spatie/laravel-permission", - "version": "6.10.0", + "version": "6.10.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "2444bb914a52c570c00ae8c94e096a58e01b2317" + "reference": "8bb69d6d67387f7a00d93a2f5fab98860f06e704" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/2444bb914a52c570c00ae8c94e096a58e01b2317", - "reference": "2444bb914a52c570c00ae8c94e096a58e01b2317", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/8bb69d6d67387f7a00d93a2f5fab98860f06e704", + "reference": "8bb69d6d67387f7a00d93a2f5fab98860f06e704", "shasum": "" }, "require": { @@ -10646,7 +10646,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/6.10.0" + "source": "https://github.com/spatie/laravel-permission/tree/6.10.1" }, "funding": [ { @@ -10654,7 +10654,7 @@ "type": "github" } ], - "time": "2024-11-05T17:30:49+00:00" + "time": "2024-11-08T18:45:41+00:00" }, { "name": "spatie/laravel-sitemap", @@ -15130,16 +15130,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -15178,7 +15178,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -15186,7 +15186,7 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nunomaduro/collision", @@ -17916,5 +17916,5 @@ "ext-json": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/resources/views/emails/new_reply.blade.php b/resources/views/emails/new_reply.blade.php index 0ba90794..abf1d752 100644 --- a/resources/views/emails/new_reply.blade.php +++ b/resources/views/emails/new_reply.blade.php @@ -1,5 +1,5 @@ @component('mail::message') - **{{ '@' . $reply->author->username }}** a répondu à ce sujet. + **{{ '@' . $reply->user->username }}** a répondu à ce sujet. @component('mail::panel') {{ $reply->excerpt(200) }} @@ -10,7 +10,6 @@ @endcomponent @component('mail::subcopy') - Vous recevez ceci parce que vous êtes abonné à ce sujet. [Se - désabonner]({{ route('subscriptions.unsubscribe', $subscription->uuid()->toString()) }}) de ce sujet. + Vous recevez ceci parce que vous êtes abonné à ce sujet. [Se désabonner]({{ route('subscriptions.unsubscribe', $subscription->uuid()->toString()) }}) de ce sujet. @endcomponent -@endcomponent +@endcomponent \ No newline at end of file diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php index 81dc2328..255956a8 100644 --- a/resources/views/vendor/mail/html/layout.blade.php +++ b/resources/views/vendor/mail/html/layout.blade.php @@ -44,7 +44,7 @@ class="inner-body" - {{ Illuminate\Mail\Markdown::parse($slot) }} + {!! $slot !!} {{ $subcopy ?? '' }} From 9e1373ee1bb6d4a954daae47e9e2ba592f6a12ac Mon Sep 17 00:00:00 2001 From: Stevy Endaman Date: Mon, 11 Nov 2024 14:58:07 +0100 Subject: [PATCH 2/2] feat: (LAR-109) update reply email. --- resources/views/emails/new_reply.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/emails/new_reply.blade.php b/resources/views/emails/new_reply.blade.php index abf1d752..b65935bf 100644 --- a/resources/views/emails/new_reply.blade.php +++ b/resources/views/emails/new_reply.blade.php @@ -1,5 +1,5 @@ @component('mail::message') - **{{ '@' . $reply->user->username }}** a répondu à ce sujet. + {{ '@' . $reply->user->username }} a répondu à ce sujet. @component('mail::panel') {{ $reply->excerpt(200) }}