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/activitypub/actor_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/activitypub/actor_serializer.rb')
-rw-r--r-- | app/serializers/activitypub/actor_serializer.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb index 48707aa16c1..bd16483484f 100644 --- a/app/serializers/activitypub/actor_serializer.rb +++ b/app/serializers/activitypub/actor_serializer.rb @@ -2,6 +2,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer include RoutingHelper + include FormattingHelper context :security @@ -102,7 +103,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer end def summary - object.suspended? ? '' : Formatter.instance.simplified_format(object) + object.suspended? ? '' : html_aware_format(object.note, object.local?) end def icon @@ -185,6 +186,8 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer end class Account::FieldSerializer < ActivityPub::Serializer + include FormattingHelper + attributes :type, :name, :value def type @@ -192,7 +195,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer end def value - Formatter.instance.format_field(object.account, object.value) + html_aware_format(object.value, object.account.value?, with_rel_me: true, with_domains: true, multiline: false) end end |