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/admin | |
| 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/admin')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/admin/reports/_status.html.haml | 6 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 805cf8a4f..b252f3eac 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -16,16 +16,16 @@ .account__header__fields - fields.each do |field| %dl - %dt.emojify{ title: field.name }= Formatter.instance.format_field(account, field.name, custom_emojify: true) + %dt.emojify{ title: field.name }= prerender_custom_emojis(h(field.name), account.emojis) %dd{ title: field.value, class: custom_field_classes(field) } - if field.verified? %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) } = fa_icon 'check' - = Formatter.instance.format_field(account, field.value, custom_emojify: true) + = prerender_custom_emojis(html_aware_format(field.value, account.local?, with_rel_me: true, with_domains: true, multiline: false), account.emojis) - if account.note.present? %div - .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true) + .account__header__content.emojify= prerender_custom_emojis(html_aware_format(account.note, account.local?), account.emojis) .dashboard__counters.admin-account-counters %div diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index 7538cfd54..392fc8f81 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -4,12 +4,12 @@ .batch-table__row__content .status__content>< - if status.proper.spoiler_text.blank? - = Formatter.instance.format(status.proper, custom_emojify: true) + = prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis) - else %details< %summary>< - %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)} - = Formatter.instance.format(status.proper, custom_emojify: true) + %strong> Content warning: #{prerender_custom_emojis(h(status.proper.spoiler_text), status.proper.emojis)} + = prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis) - unless status.proper.ordered_media_attachments.empty? - if status.proper.ordered_media_attachments.first.video? diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index 25b751335..41fed2efb 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -27,7 +27,7 @@ = fa_icon('lock') if @report.target_account.locked? - if @report.target_account.note.present? .account-card__bio.emojify - = Formatter.instance.simplified_format(@report.target_account, custom_emojify: true) + = prerender_custom_emojis(html_aware_format(@report.target_account.note, @report.target_account.local?), @report.target_account.emojis) .account-card__actions .account-card__counters .account-card__counters__item |