Restore previous state

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index fd2f84e51537e563b52e2564777af01e13be73ef..f1cd652f47d74885fcec77d72e55226524b20bc3 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -209,7 +209,7 @@ class ActivityPub
 
                foreach ($items as $activity) {
                        $ldactivity = JsonLD::compact($activity);
-                       ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity), $uid, true);
+                       ActivityPub\Receiver::processActivity($ldactivity, '', $uid, true);
                }
        }
 

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 2f4c7845373ce679d3d309e22021d91b3ef69811..14b993e6e2aaeeea0091eaffe9c2364082212fb6 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -687,7 +687,7 @@ class Processor
 
                $ldactivity['thread-completion'] = true;
 
-               ActivityPub\Receiver::processActivity($ldactivity, json_encode($activity));
+               ActivityPub\Receiver::processActivity($ldactivity);
                Logger::notice('Activity had been fetched and processed.', ['url' => $url, 'object' => $activity['id']]);
 
                return $activity['id'];

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 67404af5e5dbf500397c4e18b54cfeef388fdf5d..97eb3b62c69c854c49a974133be0832768b3a154 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -784,11 +784,7 @@ class Receiver
                }
 
                if (in_array($type, self::CONTENT_TYPES)) {
-                       $object_data = self::processObject($object);
-                       if (!empty($data)) {
-                               $object_data['raw'] = json_encode($data);
-                       }
-                       return $object_data;
+                       return self::processObject($object);
                }
 
                if ($type == 'as:Announce') {