diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-03-26 02:53:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-26 02:53:34 +0100 |
| commit | cefa526c6d3a45df2d0fcb7643ced828e2e87dea (patch) | |
| tree | e3d19aa7d0881ae59d25692fb0c16b781c691b40 /app/views/statuses | |
| parent | 2dd30804b62f750c2780b7043318cbe00d137429 (diff) | |
Refactor formatter (#17828)
* Refactor formatter * Move custom emoji pre-rendering logic to view helpers * Move more methods out of Formatter * Fix code style issues * Remove Formatter * Add inline poll options to RSS feeds * Remove unused helper method * Fix code style issues * Various fixes and improvements * Fix test
Diffstat (limited to 'app/views/statuses')
| -rw-r--r-- | app/views/statuses/_detailed_status.html.haml | 5 | ||||
| -rw-r--r-- | app/views/statuses/_poll.html.haml | 4 | ||||
| -rw-r--r-- | app/views/statuses/_simple_status.html.haml | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml index fd7e034b1..1d0e5a38c 100644 --- a/app/views/statuses/_detailed_status.html.haml +++ b/app/views/statuses/_detailed_status.html.haml @@ -18,10 +18,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) diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml index 3546a923e..d0f264095 100644 --- a/app/views/statuses/_poll.html.haml +++ b/app/views/statuses/_poll.html.haml @@ -12,7 +12,7 @@ %span.poll__number>< = "#{percent.round}%" %span.poll__option__text - = Formatter.instance.format_poll_option(status, option, autoplay: prefers_autoplay?) + = prerender_custom_emojis(h(option.title), status.emojis) - if own_votes.include?(index) %span.poll__voted %i.poll__voted__mark.fa.fa-check @@ -23,7 +23,7 @@ %label.poll__option>< %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}>< %span.poll__option__text - = Formatter.instance.format_poll_option(status, option, autoplay: prefers_autoplay?) + = prerender_custom_emojis(h(option.title), status.emojis) .poll__footer - unless show_results %button.button.button-secondary{ disabled: true } diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 8ffd3cb74..13b6613ce 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) |