diff --git a/app/serializers/rss/account_serializer.rb b/app/serializers/rss/account_serializer.rb index 95e56ac5..361b288c 100644 --- a/app/serializers/rss/account_serializer.rb +++ b/app/serializers/rss/account_serializer.rb @@ -22,7 +22,7 @@ class RSS::AccountSerializer item.title(status.title) .link(TagManager.instance.url_for(status)) .pub_date(status.created_at) - .description(status.spoiler_text.presence || Formatter.instance.format(status, inline_poll_options: true).to_str) + .description(status.spoiler_text.presence || Formatter.instance.plaintext(status).to_str) status.media_attachments.each do |media| item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size) diff --git a/app/serializers/rss/tag_serializer.rb b/app/serializers/rss/tag_serializer.rb index 21ae1900..dc07a837 100644 --- a/app/serializers/rss/tag_serializer.rb +++ b/app/serializers/rss/tag_serializer.rb @@ -20,7 +20,7 @@ class RSS::TagSerializer item.title(status.title) .link(TagManager.instance.url_for(status)) .pub_date(status.created_at) - .description(status.spoiler_text.presence || Formatter.instance.format(status).to_str) + .description(status.spoiler_text.presence || Formatter.instance.plaintext(status).to_str) status.media_attachments.each do |media| item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size) diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml index af9e4bf5..4f503819 100644 --- a/app/views/notification_mailer/_status.html.haml +++ b/app/views/notification_mailer/_status.html.haml @@ -20,7 +20,7 @@ = Formatter.instance.format_spoiler(status) %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' } - = Formatter.instance.format(status) + = Formatter.instance.plaintext(status) %p = link_to l(status.created_at), web_url("#{status.account.username}/posts/#{status.id}")