random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issues with status formatting in rss, email 

• Fixed:
- issues with status formatting in rss, email
This commit is contained in:
mgabdev 2020-07-01 21:39:12 -04:00
parent 91b443b3ed
commit 7410c4c6ab
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/rss/account_serializer.rb
View File

@ -22,7 +22,7 @@ class RSS::AccountSerializer
item.title(status.title) item.title(status.title)
.link(TagManager.instance.url_for(status)) .link(TagManager.instance.url_for(status))
.pub_date(status.created_at) .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| status.media_attachments.each do |media|
item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size) item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size)

2
app/serializers/rss/tag_serializer.rb
View File

@ -20,7 +20,7 @@ class RSS::TagSerializer
item.title(status.title) item.title(status.title)
.link(TagManager.instance.url_for(status)) .link(TagManager.instance.url_for(status))
.pub_date(status.created_at) .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| status.media_attachments.each do |media|
item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size) item.enclosure(full_asset_url(media.file.url(:original, false)), media.file.content_type, length: media.file.size)

2
app/views/notification_mailer/_status.html.haml
View File

@ -20,7 +20,7 @@
= Formatter.instance.format_spoiler(status) = Formatter.instance.format_spoiler(status)
%div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' } %div{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
= Formatter.instance.format(status) = Formatter.instance.plaintext(status)
%p %p
= link_to l(status.created_at), web_url("#{status.account.username}/posts/#{status.id}") = link_to l(status.created_at), web_url("#{status.account.username}/posts/#{status.id}")