clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10580 from MrPetovan/bug/10019-peertube-embed 

Simplify attachment processing in Protocol\ActivityPub\Receiver
This commit is contained in:
Michael Vogel 2021-08-11 13:56:33 +02:00 committed by GitHub
parent e146a5983c d7e5814b12
commit b855646097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1290,7 +1290,7 @@ class Receiver
$filetype = strtolower(substr($mediatype, 0, strpos($mediatype, '/'))); $filetype = strtolower(substr($mediatype, 0, strpos($mediatype, '/')));
if ($filetype == 'audio') { if ($filetype == 'audio') {
$attachments[$filetype] = ['type' => $mediatype, 'url' => $href, 'height' => null, 'size' => null]; $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => null, 'size' => null, 'name' => ''];
} elseif ($filetype == 'video') { } elseif ($filetype == 'video') {
$height = (int)JsonLD::fetchElement($url, 'as:height', '@value'); $height = (int)JsonLD::fetchElement($url, 'as:height', '@value');
// PeerTube audio-only track // PeerTube audio-only track
@ -1299,12 +1299,7 @@ class Receiver
} }
$size = (int)JsonLD::fetchElement($url, 'pt:size', '@value'); $size = (int)JsonLD::fetchElement($url, 'pt:size', '@value');
// For embedded video we take the smallest available size $attachments[] = ['type' => $filetype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'size' => $size, 'name' => ''];
if (!empty($attachments[$mediatype]['size']) && ($size > $attachments[$mediatype]['size'])) {
continue;
}
$attachments[$filetype] = ['type' => $mediatype, 'url' => $href, 'height' => $height, 'size' => $size];
} elseif (in_array($mediatype, ['application/x-bittorrent', 'application/x-bittorrent;x-scheme-handler/magnet'])) { } elseif (in_array($mediatype, ['application/x-bittorrent', 'application/x-bittorrent;x-scheme-handler/magnet'])) {
$height = (int)JsonLD::fetchElement($url, 'as:height', '@value'); $height = (int)JsonLD::fetchElement($url, 'as:height', '@value');
@ -1313,14 +1308,14 @@ class Receiver
continue; continue;
} }
$attachments[$mediatype] = ['type' => $mediatype, 'url' => $href, 'height' => $height, 'size' => null]; $attachments[$mediatype] = ['type' => $mediatype, 'mediaType' => $mediatype, 'url' => $href, 'height' => $height, 'size' => null, 'name' => ''];
} elseif ($mediatype == 'application/x-mpegURL') { } elseif ($mediatype == 'application/x-mpegURL') {
// PeerTube exception, actual video link is in the tags of this URL element // PeerTube exception, actual video link is in the tags of this URL element
$attachments = array_merge($attachments, self::processAttachmentUrls($url['as:tag'])); $attachments = array_merge($attachments, self::processAttachmentUrls($url['as:tag']));
} }
} }
return $attachments; return array_values($attachments);
} }
/** /**
@ -1419,18 +1414,7 @@ class Receiver
if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) { if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) {
$object_data['alternate-url'] = self::extractAlternateUrl($object['as:url'] ?? []) ?: $object_data['alternate-url']; $object_data['alternate-url'] = self::extractAlternateUrl($object['as:url'] ?? []) ?: $object_data['alternate-url'];
$object_data['attachments'] = array_merge($object_data['attachments'], self::processAttachmentUrls($object['as:url'] ?? []));
$attachments = self::processAttachmentUrls($object['as:url'] ?? []);
foreach ($attachments as $type => $attachment) {
$object_data['attachments'][] = [
'type' => $type,
'mediaType' => $attachment['type'],
'height' => $attachment['height'],
'size' => $attachment['size'],
'name' => '',
'url' => $attachment['url']
];
}
} }
$receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true); $receiverdata = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);