From f871105ef984efc5e093aa0068e438fa532014c7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 15 Apr 2020 20:52:30 +0000
Subject: [PATCH] Use name or nick

---
 src/Protocol/ActivityPub/Processor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 5f413f57b6..5b12d99160 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -602,8 +602,8 @@ class Processor
 				}
 				if (!empty($tag['href'])) {
 					$apcontact = APContact::getByURL($tag['href']);
-					if (!empty($apcontact['name'])) {
-						$fields['name'] = $apcontact['name'];
+					if (!empty($apcontact['name']) || !empty($apcontact['nick'])) {
+						$fields['name'] = $apcontact['name'] ?: $apcontact['nick'];
 					}
 				}
 			} elseif ($tag['type'] == 'Hashtag') {