diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
commit | f313bf3e97ddd83e7847ae00f5bdb488942c943c (patch) | |
tree | 5035b4504d35a85cb0b2fcbc65ce57ed5d0de71d /app/views/notification_mailer | |
parent | a4e1830b5f15118bf2532401005376a0c6e896e6 (diff) | |
parent | 30658924a80434e6a2bceb61267b911ea8d37898 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/notification_mailer')
-rw-r--r-- | app/views/notification_mailer/_status.text.erb | 2 | ||||
-rw-r--r-- | app/views/notification_mailer/digest.text.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb index bf6d2b620..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(extract_plain_text(status.text, status.local?), 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 b767eb9c4..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 extract_plain_text(notification.target_status.text, notification.target_status.local?) %> + <%= raw extract_status_plain_text(notification.target_status) %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{notification.target_status.id}") %> <% end %> |