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/serializers/rest/account_serializer.rb | |
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/serializers/rest/account_serializer.rb')
-rw-r--r-- | app/serializers/rest/account_serializer.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index a78ec4507..2f67e06b2 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -2,6 +2,7 @@ class REST::AccountSerializer < ActiveModel::Serializer include RoutingHelper + include FormattingHelper attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :group, :created_at, :note, :url, :avatar, :avatar_static, :header, :header_static, @@ -14,10 +15,12 @@ class REST::AccountSerializer < ActiveModel::Serializer attribute :suspended, if: :suspended? class FieldSerializer < ActiveModel::Serializer + include FormattingHelper + attributes :name, :value, :verified_at def value - Formatter.instance.format_field(object.account, object.value) + html_aware_format(object.value, object.account.local?, with_rel_me: true, with_domains: true, multiline: false) end end @@ -32,7 +35,7 @@ class REST::AccountSerializer < ActiveModel::Serializer end def note - object.suspended? ? '' : Formatter.instance.simplified_format(object) + object.suspended? ? '' : html_aware_format(object.note, object.local?) end def url |