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

Funkwhale support added, Peertube support improved

This commit is contained in:
Michael 2020-03-23 04:43:06 +00:00
parent 3b3085369c
commit 50e0ea5b3e
2 changed files with 86 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Protocol/ActivityPub/Processor.php
View File

@ -133,6 +133,18 @@ class Processor
} else {
$item['body'] .= "\n[img=" . $attach['url'] . ']' . $attach['name'] . '[/img]';
}
} elseif ($filetype == 'audio') {
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
continue;
}
$item['body'] .= "\n[audio]" . $attach['url'] . '[/audio]';
} elseif ($filetype == 'video') {
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
continue;
}
$item['body'] .= "\n[video]" . $attach['url'] . '[/video]';
} else {
if (!empty($item["attach"])) {
$item["attach"] .= ',';
@ -387,10 +399,6 @@ class Processor
}
$item['content-warning'] = HTML::toBBCode($activity['summary']);
$item['body'] = $content;
if (($activity['object_type'] == 'as:Video') && !empty($activity['alternate-url'])) {
$item['body'] .= "\n[video]" . $activity['alternate-url'] . '[/video]';
}
}
$item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive']);

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

@ -55,7 +55,7 @@ class Receiver
{
const PUBLIC_COLLECTION = 'as:Public';
const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application'];
const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event'];
const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event', 'as:Audio'];
const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept'];
/**
@ -936,6 +936,75 @@ class Receiver
return $object_data;
}
/**
* Check if the "as:url" element is an array with multiple links
* This is the case with audio and video posts.
* Then the links are added as attachments
*
* @param array $object The raw object
* @param array $object_data The parsed object data for later processing
* @return array the object data
*/
private static function processAttachmentUrls(array $object, array $object_data) {
// Check if this is some url with multiple links
if (empty($object['as:url'])) {
return $object_data;
}
$urls = $object['as:url'];
$keys = array_keys($urls);
if (!is_numeric(array_pop($keys))) {
return $object_data;
}
$attachments = [];
foreach ($urls as $url) {
if (empty($url['@type']) || ($url['@type'] != 'as:Link')) {
continue;
}
$href = JsonLD::fetchElement($url, 'as:href', '@id');
if (empty($href)) {
continue;
}
$mediatype = JsonLD::fetchElement($url, 'as:mediaType');
if (empty($mediatype)) {
continue;
}
if ($mediatype == 'text/html') {
$object_data['alternate-url'] = $href;
}
$filetype = strtolower(substr($mediatype, 0, strpos($mediatype, '/')));
if ($filetype == 'audio') {
$attachments[$filetype] = ['type' => $mediatype, 'url' => $href];
} elseif ($filetype == 'video') {
$height = (int)JsonLD::fetchElement($url, 'as:height', '@value');
// We save bandwidth by using a moderate height
// Peertube normally uses these heights: 240, 360, 480, 720, 1080
if (!empty($attachments[$filetype]['height']) &&
(($height > 480) || $height < $attachments[$filetype]['height'])) {
continue;
}
$attachments[$filetype] = ['type' => $mediatype, 'url' => $href, 'height' => $height];
}
}
foreach ($attachments as $type => $attachment) {
$object_data['attachments'][] = ['type' => $type,
'mediaType' => $attachment['type'],
'name' => '',
'url' => $attachment['url']];
}
return $object_data;
}
/**
* Fetches data from the object part of an activity
*
@ -1019,6 +1088,10 @@ class Receiver
}
}
if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) {
$object_data = self::processAttachmentUrls($object, $object_data);
}
$object_data['receiver'] = self::getReceivers($object, $object_data['actor'], $object_data['tags'], true);
$object_data['unlisted'] = in_array(-1, $object_data['receiver']);
unset($object_data['receiver']['uid:-1']);