diff options
| author | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
| commit | f7491de676298b8f78084c00f0026f8cf36d92fc (patch) | |
| tree | 0ac29d1598efeb2a0de9bd1b54ae7590e88479da /app/views/statuses/_simple_status.html.haml | |
| parent | f37056e6c351a08d09c3986586cc7d27bdea85ab (diff) | |
| parent | 363773d0e9ffa9f4efc564603327f225193a2bf1 (diff) | |
Update to Mastodon 2.5.0
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/views/statuses/_simple_status.html.haml')
| -rw-r--r-- | app/views/statuses/_simple_status.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index a41656323..7b672bda7 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -30,10 +30,11 @@ .status__content.emojify{ :data => ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }< - if status.spoiler_text? %p< - %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: prefers_autoplay?)} + %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)} %button.status__content__spoiler-link= t('statuses.show_more') .e-content< - = Formatter.instance.format(status, custom_emojify: true, autoplay: prefers_autoplay?) + = prerender_custom_emojis(status_content_format(status), status.emojis) + - if status.preloadable_poll = render_poll_component(status) |