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
This commit is contained in:
Hypolite Petovan 2019-10-24 08:47:00 -04:00
parent 9f460c6797
commit b0987f637c

View File

@ -859,7 +859,9 @@ class GContact
/** /**
* Update a global contact via an ActivityPub Outbox * 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) private static function updateFromOutbox(string $feed, array $data)
{ {
@ -872,6 +874,9 @@ class GContact
$items = $outbox['orderedItems']; $items = $outbox['orderedItems'];
} elseif (!empty($outbox['first']['orderedItems'])) { } elseif (!empty($outbox['first']['orderedItems'])) {
$items = $outbox['first']['orderedItems']; $items = $outbox['first']['orderedItems'];
} elseif (!empty($outbox['first']['href'])) {
self::updateFromOutbox($outbox['first']['href'], $data);
return;
} elseif (!empty($outbox['first'])) { } elseif (!empty($outbox['first'])) {
self::updateFromOutbox($outbox['first'], $data); self::updateFromOutbox($outbox['first'], $data);
return; return;