friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor Receiver::processObject() method

pull/14529/head
Art4 2024-11-14 07:32:25 +00:00
parent ee2cdc7763
commit 2ef9982f63
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Protocol/ActivityPub/Receiver.php
View File

@ -1880,31 +1880,29 @@ class Receiver
$object_data = self::getObjectDataFromActivity($object); $object_data = self::getObjectDataFromActivity($object);
$object_data['receiver_urls'] = self::getReceiverURL($object);
$object_data['receiver'] = [];
$object_data['reception_type'] = [];
$object_data['unlisted'] = false;
$receiverdata = self::getReceivers($object, $actor ?: $object_data['actor'] ?? '', $object_data['tags'], true, false); $receiverdata = self::getReceivers($object, $actor ?: $object_data['actor'] ?? '', $object_data['tags'], true, false);
$receivers = $reception_types = [];
foreach ($receiverdata as $key => $data) { foreach ($receiverdata as $key => $data) {
$receivers[$key] = $data['uid']; if ($data['uid'] !== -1) {
$reception_types[$data['uid']] = $data['type'] ?? 0; $object_data['reception_type'][$data['uid']] = $data['type'] ?? 0;
} }
$object_data['receiver_urls'] = self::getReceiverURL($object); if ($key !== -1) {
$object_data['receiver'] = $receivers; $object_data['receiver'][$key] = $data['uid'];
$object_data['reception_type'] = $reception_types; } else {
$object_data['unlisted'] = false; $object_data['unlisted'] = true;
}
}
if (!empty($object['pixelfed:capabilities'])) { if (!empty($object['pixelfed:capabilities'])) {
$object_data['capabilities'] = self::getCapabilities($object); $object_data['capabilities'] = self::getCapabilities($object);
} }
if (in_array(-1, $object_data['receiver'])) {
$object_data['unlisted'] = true;
unset($object_data['receiver'][-1]);
if (array_key_exists(-1, $object_data['reception_type'])) {
unset($object_data['reception_type'][-1]);
}
}
return $object_data; return $object_data;
} }