Merge pull request #8904 from MrPetovan/task/ap-conversion-admin-module

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

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index aa59b9eb9e722e0455adbe9017f026f2ecf1e8f9..226ad601044c68f112850985e8013a0a724886ed 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -184,7 +184,7 @@ class Receiver
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function prepareObjectData($activity, $uid, $push, &$trust_source)
+       public static function prepareObjectData($activity, $uid, $push, &$trust_source)
        {
                $actor = JsonLD::fetchElement($activity, 'as:actor', '@id');
                if (empty($actor)) {
@@ -227,6 +227,7 @@ class Receiver
                        if ($type == 'as:Announce') {
                                $trust_source = false;
                        }
+
                        $object_data = self::fetchObject($object_id, $activity['as:object'], $trust_source, $uid);
                        if (empty($object_data)) {
                                Logger::log("Object data couldn't be processed", Logger::DEBUG);
@@ -337,7 +338,6 @@ class Receiver
                if (!JsonLD::fetchElement($activity, 'as:actor', '@id')) {
                        Logger::log('Empty actor', Logger::DEBUG);
                        return;
-
                }
 
                // Don't trust the source if "actor" differs from "attributedTo". The content could be forged.
@@ -374,7 +374,8 @@ class Receiver
                switch ($type) {
                        case 'as:Create':
                                if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
-                                       ActivityPub\Processor::createItem($object_data);
+                                       $item = ActivityPub\Processor::createItem($object_data);
+                                       ActivityPub\Processor::postItem($object_data, $item);
                                }
                                break;
 
@@ -391,7 +392,8 @@ class Receiver
                                        // If this isn't set, then a single reshare appears on top. This is used for groups.
                                        $object_data['thread-completion'] = ($profile['type'] != 'Group');
 
-                                       ActivityPub\Processor::createItem($object_data);
+                                       $item = ActivityPub\Processor::createItem($object_data);
+                                       ActivityPub\Processor::postItem($object_data, $item);
 
                                        // Add the bottom reshare information only for persons
                                        if ($profile['type'] != 'Group') {