nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5921 from annando/ap-video

Browse source 
ActivityPub: Rudimentary support for videos
This commit is contained in:
Hypolite Petovan 2018-10-14 14:05:51 -04:00 committed by GitHub
parent 68af56a10e 37ad4a7d22
commit ce74a4d9a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Protocol/ActivityPub/Processor.php
View file

@ -211,6 +211,11 @@ class Processor
$item['title'] = HTML::toBBCode($activity['name']); $item['title'] = HTML::toBBCode($activity['name']);
$item['content-warning'] = HTML::toBBCode($activity['summary']); $item['content-warning'] = HTML::toBBCode($activity['summary']);
$item['body'] = self::convertMentions(HTML::toBBCode($activity['content'])); $item['body'] = self::convertMentions(HTML::toBBCode($activity['content']));
if (($activity['object_type'] == 'as:Video') && !empty($activity['alternate-url'])) {
$item['body'] .= "\n[video]" . $activity['alternate-url'] . '[/video]';
}
$item['location'] = $activity['location']; $item['location'] = $activity['location'];
if (!empty($item['latitude']) && !empty($item['longitude'])) { if (!empty($item['latitude']) && !empty($item['longitude'])) {

6
src/Protocol/ActivityPub/Receiver.php
View file

@ -698,10 +698,10 @@ class Receiver
// Special treatment for Hubzilla links // Special treatment for Hubzilla links
if (is_array($object_data['alternate-url'])) { if (is_array($object_data['alternate-url'])) {
if (!empty($object['as:url'])) { $object_data['alternate-url'] = JsonLD::fetchElement($object_data['alternate-url'], 'as:href');
if (!is_string($object_data['alternate-url'])) {
$object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href'); $object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href');
} else {
$object_data['alternate-url'] = null;
} }
} }