diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-29 16:39:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-29 16:39:43 +0200 |
commit | eaea849035ea407afb2d5db411dbddc1ccca6f44 (patch) | |
tree | 19a0b6e761fc453fac2f5a8aba24595ad93f0382 /app/serializers/activitypub/actor_serializer.rb | |
parent | 2287eebae0c1d699436a8cf3218d7cfe990a3605 (diff) | |
parent | 8d6f3f8a379c8d552d2101cf35ae8f6fe956da53 (diff) |
Merge pull request #1724 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 48707aa16..e6dd8040e 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? ? '' : account_bio_format(object) 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) + account_field_value_format(object) end end |