diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-29 16:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 16:39:43 +0200 |
| commit | eaea849035ea407afb2d5db411dbddc1ccca6f44 (patch) | |
| tree | 19a0b6e761fc453fac2f5a8aba24595ad93f0382 /app/views/notification_mailer | |
| parent | 2287eebae0c1d699436a8cf3218d7cfe990a3605 (diff) | |
| parent | 8d6f3f8a379c8d552d2101cf35ae8f6fe956da53 (diff) | |
Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/notification_mailer')
| -rw-r--r-- | app/views/notification_mailer/_status.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notification_mailer/_status.text.erb | 2 | ||||
| -rw-r--r-- | app/views/notification_mailer/digest.text.erb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml index 219e7e667..444b06fe6 100644 --- a/app/views/notification_mailer/_status.html.haml +++ b/app/views/notification_mailer/_status.html.haml @@ -28,10 +28,10 @@ - if status.spoiler_text? %div.auto-dir %p - = Formatter.instance.format_spoiler(status) + = status.spoiler_text %div.auto-dir - = Formatter.instance.format(status) + = status_content_format(status) - if status.ordered_media_attachments.size > 0 %p diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb index c43f32d9f..1dc8de739 100644 --- a/app/views/notification_mailer/_status.text.erb +++ b/app/views/notification_mailer/_status.text.erb @@ -3,6 +3,6 @@ > ---- > <% end %> -> <%= raw word_wrap(Formatter.instance.plaintext(status), break_sequence: "\n> ") %> +> <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %> diff --git a/app/views/notification_mailer/digest.text.erb b/app/views/notification_mailer/digest.text.erb index 4cd4190c1..0f84a4ef0 100644 --- a/app/views/notification_mailer/digest.text.erb +++ b/app/views/notification_mailer/digest.text.erb @@ -5,7 +5,7 @@ * <%= raw t('notification_mailer.digest.mention', name: notification.from_account.pretty_acct) %> - <%= raw Formatter.instance.plaintext(notification.target_status) %> + <%= raw extract_status_plain_text(notification.target_status) %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{notification.target_status.id}") %> <% end %> |