feat: notification unsubscribe & email overhaul with HTML multipart (#3872)

extensions/mentions/locale/en.yml

@@ -70,40 +70,43 @@ flarum-mentions:
     # These translations are used in emails sent when a post is replied to
     post_mentioned:
       subject: "{replier_display_name} replied to your post in {title}"
-      body: |
-        Hey {recipient_display_name}!
+      plain:
+        body: |
+          {replier_display_name} replied to your post (#{post_number}) in {title}.
 
-        {replier_display_name} replied to your post (#{post_number}) in {title}.
+          {url}
 
-        {url}
+          ---
 
-        ---
-
-        {content}
+          {content}
+      html:
+        body: "{replier_display_name} replied to your post (#{post_number}) in [{title}]({url})."
 
     # These translations are used in emails sent when a user is mentioned
     user_mentioned:
       subject: "{mentioner_display_name} mentioned you in {title}"
-      body: |
-        Hey {recipient_display_name}!
+      plain:
+        body: |
+          {mentioner_display_name} mentioned you in a post in {title}.
 
-        {mentioner_display_name} mentioned you in a post in {title}.
+          {url}
 
-        {url}
+          ---
 
-        ---
-
-        {content}
+          {content}
+      html:
+        body: "{mentioner_display_name} mentioned you in a post in [{title}]({url})."
     # These translations are used in emails sent when a group is mentioned
     group_mentioned:
       subject: "{mentioner_display_name} mentioned a group you're a member of in {title}"
-      body: |
-        Hey {recipient_display_name}!
+      plain:
+        body: |
+          {mentioner_display_name} mentioned a group you're a member of in {title}.
 
-        {mentioner_display_name} mentioned a group you're a member of in {title}.
+          {url}
 
-        {url}
+          ---
 
-        ---
-
-        {content}
+          {content}
+      html:
+        body: "{mentioner_display_name} mentioned a group you're a member of in [{title}]({url})."

extensions/mentions/src/Notification/GroupMentionedBlueprint.php

@@ -38,9 +38,11 @@ class GroupMentionedBlueprint implements BlueprintInterface, MailableInterface
         return null;
     }
 
-    public function getEmailView(): string|array
+    public function getEmailViews(): array
     {
-        return ['text' => 'flarum-mentions::emails.groupMentioned'];
+        return [
+            'text' => 'flarum-mentions::emails.plain.groupMentioned',
+            'html' => 'flarum-mentions::emails.html.groupMentioned', ];
     }
 
     public function getEmailSubject(TranslatorInterface $translator): string

extensions/mentions/src/Notification/PostMentionedBlueprint.php

@@ -39,9 +39,12 @@ class PostMentionedBlueprint implements BlueprintInterface, MailableInterface
         return ['replyNumber' => (int) $this->reply->number];
     }
 
-    public function getEmailView(): string|array
+    public function getEmailViews(): array
     {
-        return ['text' => 'flarum-mentions::emails.postMentioned'];
+        return [
+            'text' => 'flarum-mentions::emails.plain.postMentioned',
+            'html' => 'flarum-mentions::emails.html.postMentioned',
+        ];
     }
 
     public function getEmailSubject(TranslatorInterface $translator): string

extensions/mentions/src/Notification/UserMentionedBlueprint.php

@@ -38,9 +38,12 @@ class UserMentionedBlueprint implements BlueprintInterface, MailableInterface
         return null;
     }
 
-    public function getEmailView(): string|array
+    public function getEmailViews(): array
     {
-        return ['text' => 'flarum-mentions::emails.userMentioned'];
+        return [
+            'text' => 'flarum-mentions::emails.plain.userMentioned',
+            'html' => 'flarum-mentions::emails.html.userMentioned'
+        ];
     }
 
     public function getEmailSubject(TranslatorInterface $translator): string

extensions/mentions/views/emails/html/groupMentioned.blade.php

@@ -0,0 +1,13 @@
+@extends('flarum.forum::email.html.notification.base')
+
+@section('notificationContent')
+{!! $formatter->convert($translator->trans('flarum-mentions.email.group_mentioned.html.body', [
+'{mentioner_display_name}' => $blueprint->post->user->display_name,
+'{title}' => $blueprint->post->discussion->title,
+'{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number])
+])) !!}
+@endsection
+
+@section('contentPreview')
+    {!! $blueprint->post->formatContent() !!}
+@endsection

extensions/mentions/views/emails/html/postMentioned.blade.php

@@ -0,0 +1,14 @@
+@extends('flarum.forum::email.html.notification.base')
+
+@section('notificationContent')
+{!! $formatter->convert($translator->trans('flarum-mentions.email.post_mentioned.html.body', [
+'{replier_display_name}' => $blueprint->reply->user->display_name,
+'{post_number}' => $blueprint->post->number,
+'{title}' => $blueprint->post->discussion->title,
+'{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->reply->discussion_id, 'near' => $blueprint->reply->number])
+])) !!}
+@endsection
+
+@section('contentPreview')
+    {!! $blueprint->reply->formatContent() !!}
+@endsection

extensions/mentions/views/emails/html/userMentioned.blade.php

@@ -0,0 +1,13 @@
+@extends('flarum.forum::email.html.notification.base')
+
+@section('notificationContent')
+{!! $formatter->convert($translator->trans('flarum-mentions.email.user_mentioned.html.body', [
+'{mentioner_display_name}' => $blueprint->post->user->display_name,
+'{title}' => $blueprint->post->discussion->title,
+'{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number])
+])) !!}
+@endsection
+
+@section('contentPreview')
+    {!! $blueprint->post->formatContent() !!}
+@endsection

extensions/mentions/views/emails/plain/groupMentioned.blade.php

@@ -1,7 +1,10 @@
-{!! $translator->trans('flarum-mentions.email.group_mentioned.body', [
-'{recipient_display_name}' => $user->display_name,
+@extends('flarum.forum::email.plain.notification.base')
+
+@section('content')
+{!! $translator->trans('flarum-mentions.email.group_mentioned.plain.body', [
 '{mentioner_display_name}' => $blueprint->post->user->display_name,
 '{title}' => $blueprint->post->discussion->title,
 '{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number]),
 '{content}' => $blueprint->post->content
 ]) !!}
+@endsection

extensions/mentions/views/emails/plain/postMentioned.blade.php

@@ -1,8 +1,11 @@
-{!! $translator->trans('flarum-mentions.email.post_mentioned.body', [
-'{recipient_display_name}' => $user->display_name,
+@extends('flarum.forum::email.plain.notification.base')
+
+@section('content')
+{!! $translator->trans('flarum-mentions.email.post_mentioned.plain.body', [
 '{replier_display_name}' => $blueprint->reply->user->display_name,
 '{post_number}' => $blueprint->post->number,
 '{title}' => $blueprint->post->discussion->title,
 '{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->reply->discussion_id, 'near' => $blueprint->reply->number]),
 '{content}' => $blueprint->reply->content
 ]) !!}
+@endsection

extensions/mentions/views/emails/plain/userMentioned.blade.php

@@ -1,7 +1,10 @@
-{!! $translator->trans('flarum-mentions.email.user_mentioned.body', [
-'{recipient_display_name}' => $user->display_name,
+@extends('flarum.forum::email.plain.notification.base')
+
+@section('content')
+{!! $translator->trans('flarum-mentions.email.user_mentioned.plain.body', [
 '{mentioner_display_name}' => $blueprint->post->user->display_name,
 '{title}' => $blueprint->post->discussion->title,
 '{url}' => $url->to('forum')->route('discussion', ['id' => $blueprint->post->discussion_id, 'near' => $blueprint->post->number]),
 '{content}' => $blueprint->post->content
 ]) !!}
+@endsection