Merge branch 'main' into glitch-soc/merge-upstream

2022-03-28 16:22:28 +02:00
parent a4e1830b5f 30658924a8
commit f313bf3e97
24 changed files with 100 additions and 112 deletions
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@ -103,7 +103,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
  end

  def summary
-    object.suspended? ? '' : html_aware_format(object.note, object.local?)
+    object.suspended? ? '' : account_bio_format(object)
  end

  def icon
@ -195,7 +195,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
    end

    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