Merge pull request #5921 from annando/ap-video

[friendica.git] / src / Protocol / ActivityPub / Processor.php

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index d77a0277fbd4b4b12f3fded4ddbec2b044a94f80..c481423a675c495349ad2d27c7d56f8009cbd5a9 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -211,6 +211,11 @@ class Processor
                $item['title'] = HTML::toBBCode($activity['name']);
                $item['content-warning'] = HTML::toBBCode($activity['summary']);
                $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'];
 
                if (!empty($item['latitude']) && !empty($item['longitude'])) {
@@ -303,6 +308,9 @@ class Processor
                $item = ['author-id' => Contact::getIdForURL($activity['actor']),
                        'author-link' => $activity['actor']];
 
+               // Ensure that the contact has got the right network type
+               self::switchContact($item['author-id']);
+
                Contact::addRelationship($owner, $contact, $item);
                $cid = Contact::getIdForURL($activity['actor'], $uid);
                if (empty($cid)) {