Merge commit 'f826a95f6e' into kb_migration

2023-07-25 15:09:10 +09:00 · 2023-07-25 15:09:10 +09:00 · 4b65740722
commit 4b65740722
parent 5233e68f13 f826a95f6e
211 changed files with 628 additions and 599 deletions
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@ -100,7 +100,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
  end

  def name
-    object.suspended? ? '' : object.display_name
+    object.suspended? ? object.username : (object.display_name.presence || object.username)
  end

  def summary