From b0987f637c378f71d49812ec81e2fa198b4f4484 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 24 Oct 2019 08:47:00 -0400 Subject: [PATCH] Expect outbox->first to be a Link structure in Model\GContact - See https://www.w3.org/TR/activitystreams-vocabulary/#dfn-first - Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-545300597 --- src/Model/GContact.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 21225cb23..2402d6b51 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -859,7 +859,9 @@ class GContact /** * Update a global contact via an ActivityPub Outbox * - * @param string $data Probing result + * @param string $feed + * @param array $data Probing result + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function updateFromOutbox(string $feed, array $data) { @@ -872,6 +874,9 @@ class GContact $items = $outbox['orderedItems']; } elseif (!empty($outbox['first']['orderedItems'])) { $items = $outbox['first']['orderedItems']; + } elseif (!empty($outbox['first']['href'])) { + self::updateFromOutbox($outbox['first']['href'], $data); + return; } elseif (!empty($outbox['first'])) { self::updateFromOutbox($outbox['first'], $data); return;