From 58aab00cb39078f574a06f52d6e1ec6045b759fd Mon Sep 17 00:00:00 2001 From: Maxence Lange <maxence@artificial-owl.com> Date: Thu, 16 Mar 2023 16:13:50 -0100 Subject: [PATCH] fix display_name Signed-off-by: Maxence Lange <maxence@artificial-owl.com> --- lib/Model/ActivityPub/Actor/Person.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Model/ActivityPub/Actor/Person.php b/lib/Model/ActivityPub/Actor/Person.php index 3f8f74ad..4068dddd 100644 --- a/lib/Model/ActivityPub/Actor/Person.php +++ b/lib/Model/ActivityPub/Actor/Person.php @@ -420,6 +420,10 @@ class Person extends ACore implements IQueryRow, JsonSerializable { * @return string */ public function getName(): string { + if ($this->name === '') { + return $this->preferredUsername; + } + return $this->name; } @@ -781,7 +785,7 @@ class Person extends ACore implements IQueryRow, JsonSerializable { 'id' => (string)$this->getNid(), 'username' => $this->getPreferredUsername(), 'acct' => $this->isLocal() ? $this->getPreferredUsername() : $this->getAccount(), - 'display_name' => $this->getDisplayName(), + 'display_name' => $this->getName(), 'locked' => $this->isLocked(), 'bot' => $this->isBot(), 'discoverable' => $this->isDiscoverable(),