set avatarfix/noid/avatar-2

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/Model/ActivityPub/Actor/Person.php b/lib/Model/ActivityPub/Actor/Person.php
index 86a8c3e5..d155e6bc 100644
--- a/lib/Model/ActivityPub/Actor/Person.php
+++ b/lib/Model/ActivityPub/Actor/Person.php
@@ -697,6 +697,12 @@ class Person extends ACore implements IQueryRow, JsonSerializable {
 			 ->setFeatured($this->validate(self::AS_URL, 'featured', $data, ''))
 			 ->setDetailsAll($this->getArray('details', $data, []));
 
+		if ($this->hasIcon()) {
+			$this->setAvatar($this->getIcon()->getUrl());
+		} else {
+			$this->setAvatar($this->getAvatar());
+		}
+
 		try {
 			$cTime = new DateTime($this->get('creation', $data, 'yesterday'));
 			$this->setCreation($cTime->getTimestamp());