Refactor account and status formatting (#17877)

* Refactor status formatting

* Add account formatting helpers

* Remove StatusFormatter

* Fixup

* Fix copied typo
pull/1724/head
Claire 2022-03-28 01:17:17 +02:00 committed by GitHub
parent e6a159a648
commit 2c45859ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 26 additions and 16 deletions

View File

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class StatusesIndex < Chewy::Index class StatusesIndex < Chewy::Index
include FormattingHelper
settings index: { refresh_interval: '15m' }, analysis: { settings index: { refresh_interval: '15m' }, analysis: {
filter: { filter: {
english_stop: { english_stop: {
@ -57,7 +59,7 @@ class StatusesIndex < Chewy::Index
field :id, type: 'long' field :id, type: 'long'
field :account_id, type: 'long' field :account_id, type: 'long'
field :text, type: 'text', value: ->(status) { [status.spoiler_text, PlainTextFormatter.new(status.text, status.local?).to_s].concat(status.ordered_media_attachments.map(&:description)).concat(status.preloadable_poll ? status.preloadable_poll.options : []).join("\n\n") } do field :text, type: 'text', value: ->(status) { [status.spoiler_text, extract_status_plain_text(status)].concat(status.ordered_media_attachments.map(&:description)).concat(status.preloadable_poll ? status.preloadable_poll.options : []).join("\n\n") } do
field :stemmed, type: 'text', analyzer: 'content' field :stemmed, type: 'text', analyzer: 'content'
end end

View File

@ -9,11 +9,19 @@ module FormattingHelper
TextFormatter.new(text, options).to_s TextFormatter.new(text, options).to_s
end end
def extract_plain_text(text, local) def extract_status_plain_text(status)
PlainTextFormatter.new(text, local).to_s PlainTextFormatter.new(status.text, status.local?).to_s
end end
def status_content_format(status) def status_content_format(status)
html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : [])) html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
end end
def account_bio_format(account)
html_aware_format(account.note, account.local?)
end
def account_field_value_format(field, with_rel_me: true)
html_aware_format(field.value, field.account.local?, with_rel_me: with_rel_me, with_domains: true, multiline: false)
end
end end

View File

@ -446,7 +446,7 @@ class FeedManager
status = status.reblog if status.reblog? status = status.reblog if status.reblog?
combined_text = [ combined_text = [
extract_plain_text(status.text, status.local?), extract_status_plain_text(status),
status.spoiler_text, status.spoiler_text,
status.preloadable_poll ? status.preloadable_poll.options.join("\n\n") : nil, status.preloadable_poll ? status.preloadable_poll.options.join("\n\n") : nil,
status.ordered_media_attachments.map(&:description).join("\n\n"), status.ordered_media_attachments.map(&:description).join("\n\n"),

View File

@ -103,7 +103,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end end
def summary def summary
object.suspended? ? '' : html_aware_format(object.note, object.local?) object.suspended? ? '' : account_bio_format(object)
end end
def icon def icon
@ -195,7 +195,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end end
def value def value
html_aware_format(object.value, object.account.local?, with_rel_me: true, with_domains: true, multiline: false) account_field_value_format(object)
end end
end end

View File

@ -20,7 +20,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
attributes :name, :value, :verified_at attributes :name, :value, :verified_at
def value def value
html_aware_format(object.value, object.account.local?, with_rel_me: true, with_domains: true, multiline: false) account_field_value_format(object)
end end
end end
@ -35,7 +35,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
end end
def note def note
object.suspended? ? '' : html_aware_format(object.note, object.local?) object.suspended? ? '' : account_bio_format(object)
end end
def url def url

View File

@ -10,12 +10,12 @@
- if field.verified? - if field.verified?
%span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) } %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
= fa_icon 'check' = fa_icon 'check'
= prerender_custom_emojis(html_aware_format(field.value, account.local?, with_rel_me: true, with_domains: true, multiline: false), account.emojis) = prerender_custom_emojis(account_field_value_format(field), account.emojis)
= account_badge(account) = account_badge(account)
- if account.note.present? - if account.note.present?
.account__header__content.emojify= prerender_custom_emojis(html_aware_format(account.note, account.local?), account.emojis) .account__header__content.emojify= prerender_custom_emojis(account_bio_format(account), account.emojis)
.public-account-bio__extra .public-account-bio__extra
= t 'accounts.joined', date: l(account.created_at, format: :month) = t 'accounts.joined', date: l(account.created_at, format: :month)

View File

@ -21,11 +21,11 @@
- if field.verified? - if field.verified?
%span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) } %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
= fa_icon 'check' = fa_icon 'check'
= prerender_custom_emojis(html_aware_format(field.value, account.local?, with_rel_me: true, with_domains: true, multiline: false), account.emojis) = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
- if account.note.present? - if account.note.present?
%div %div
.account__header__content.emojify= prerender_custom_emojis(html_aware_format(account.note, account.local?), account.emojis) .account__header__content.emojify= prerender_custom_emojis(account_bio_format(account), account.emojis)
.dashboard__counters.admin-account-counters .dashboard__counters.admin-account-counters
%div %div

View File

@ -27,7 +27,7 @@
= fa_icon('lock') if @report.target_account.locked? = fa_icon('lock') if @report.target_account.locked?
- if @report.target_account.note.present? - if @report.target_account.note.present?
.account-card__bio.emojify .account-card__bio.emojify
= prerender_custom_emojis(html_aware_format(@report.target_account.note, @report.target_account.local?), @report.target_account.emojis) = prerender_custom_emojis(account_bio_format(@report.target_account), @report.target_account.emojis)
.account-card__actions .account-card__actions
.account-card__counters .account-card__counters
.account-card__counters__item .account-card__counters__item

View File

@ -34,7 +34,7 @@
= fa_icon('lock') if account.locked? = fa_icon('lock') if account.locked?
- if account.note.present? - if account.note.present?
.account-card__bio.emojify .account-card__bio.emojify
= prerender_custom_emojis(html_aware_format(account.note, account.local?), account.emojis) = prerender_custom_emojis(account_bio_format(account), account.emojis)
- else - else
.flex-spacer .flex-spacer
.account-card__actions .account-card__actions

View File

@ -3,6 +3,6 @@
> ---- > ----
> >
<% end %> <% end %>
> <%= raw word_wrap(extract_plain_text(status.text, status.local?), break_sequence: "\n> ") %> > <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %>
<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>

View File

@ -5,7 +5,7 @@
* <%= raw t('notification_mailer.digest.mention', name: notification.from_account.pretty_acct) %> * <%= raw t('notification_mailer.digest.mention', name: notification.from_account.pretty_acct) %>
<%= raw extract_plain_text(notification.target_status.text, notification.target_status.local?) %> <%= raw extract_status_plain_text(notification.target_status) %>
<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{notification.target_status.id}") %> <%= raw t('application_mailer.view')%> <%= web_url("statuses/#{notification.target_status.id}") %>
<% end %> <% end %>