Merge pull request #10170 from annando/media-handling

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

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index f48135f77272b0ee9f1d1f286d64e491b4068b93..c98e7014396a5377760f345e53a4f4ce72afcee4 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -101,7 +101,8 @@ class Receiver
 
                $apcontact = APContact::getByURL($actor);
                if (empty($apcontact)) {
-                       Logger::notice('Unable to retrieve AP contact for actor', ['actor' => $actor]);
+                       Logger::notice('Unable to retrieve AP contact for actor - message is discarded', ['actor' => $actor]);
+                       return;
                } elseif ($apcontact['type'] == 'Application' && $apcontact['nick'] == 'relay') {
                        self::processRelayPost($ldactivity, $actor);
                        return;
@@ -521,7 +522,7 @@ class Receiver
                                                return;
                                        }
 
-                                       $item['post-type'] = Item::PT_ANNOUNCEMENT;
+                                       $item['post-reason'] = Item::PR_ANNOUNCEMENT;
                                        ActivityPub\Processor::postItem($object_data, $item);
 
                                        $announce_object_data = self::processObject($activity);
@@ -930,7 +931,7 @@ class Receiver
                        } else {
                                Logger::log('Empty content for ' . $object_id . ', check if content is available locally.', Logger::DEBUG);
 
-                               $item = Post::selectFirst([], ['uri' => $object_id]);
+                               $item = Post::selectFirst(Item::DELIVER_FIELDLIST, ['uri' => $object_id]);
                                if (!DBA::isResult($item)) {
                                        Logger::log('Object with url ' . $object_id . ' was not found locally.', Logger::DEBUG);
                                        return false;
@@ -982,6 +983,28 @@ class Receiver
                return false;
        }
 
+       /**
+        * Converts the language element (Used by Peertube)
+        *
+        * @param array $languages
+        * @return array Languages
+        */
+       public static function processLanguages(array $languages)
+       {
+               if (empty($languages)) {
+                       return [];
+               }
+
+               $language_list = [];
+
+               foreach ($languages as $language) {
+                       if (!empty($language['_:identifier']) && !empty($language['as:name'])) {
+                               $language_list[$language['_:identifier']] = $language['as:name'];
+                       }
+               }
+               return $language_list;
+       }
+
        /**
         * Convert tags from JSON-LD format into a simplified format
         *
@@ -1345,9 +1368,11 @@ class Receiver
                $object_data['name'] = JsonLD::fetchElement($object, 'as:name', '@value');
                $object_data['summary'] = JsonLD::fetchElement($object, 'as:summary', '@value');
                $object_data['content'] = JsonLD::fetchElement($object, 'as:content', '@value');
+               $object_data['mediatype'] = JsonLD::fetchElement($object, 'as:mediaType', '@value');
                $object_data = self::getSource($object, $object_data);
                $object_data['start-time'] = JsonLD::fetchElement($object, 'as:startTime', '@value');
                $object_data['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value');
+               $object_data['adjust'] = JsonLD::fetchElement($object, 'dfrn:adjust', '@value');
                $object_data['location'] = $location;
                $object_data['latitude'] = JsonLD::fetchElement($object, 'as:location', 'as:latitude', '@type', 'as:Place');
                $object_data['latitude'] = JsonLD::fetchElement($object_data, 'latitude', '@value');
@@ -1356,6 +1381,7 @@ class Receiver
                $object_data['attachments'] = self::processAttachments(JsonLD::fetchElementArray($object, 'as:attachment') ?? []);
                $object_data['tags'] = self::processTags(JsonLD::fetchElementArray($object, 'as:tag') ?? []);
                $object_data['emojis'] = self::processEmojis(JsonLD::fetchElementArray($object, 'as:tag', null, '@type', 'toot:Emoji') ?? []);
+               $object_data['languages'] = self::processLanguages(JsonLD::fetchElementArray($object, 'sc:inLanguage') ?? []);
                $object_data['generator'] = JsonLD::fetchElement($object, 'as:generator', 'as:name', '@type', 'as:Application');
                $object_data['generator'] = JsonLD::fetchElement($object_data, 'generator', '@value');
                $object_data['alternate-url'] = JsonLD::fetchElement($object, 'as:url', '@id');