Issue 8700: Resolvable activities

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index b5b5227141c1a84808d92c966c714ce72ed4e342..b1346b58507e95c254ac7f7b94ad969a386a46cc 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -65,17 +65,31 @@ class Objects extends BaseModule
                $last_modified = $item['changed'];
                Network::checkEtagModified($etag, $last_modified);
 
-               $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
-               $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
+               if (empty($parameters['activity'])) {
+                       $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+                       $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
 
-               // Only display "Create" activity objects here, no reshares or anything else
-               if (empty($activity['object']) || ($activity['type'] != 'Create')) {
+                       // Only display "Create" activity objects here, no reshares or anything else
+                       if (empty($activity['object']) || ($activity['type'] != 'Create')) {
+                               throw new HTTPException\NotFoundException();
+                       }
+
+                       $data = ['@context' => ActivityPub::CONTEXT];
+                       $data = array_merge($data, $activity['object']);
+               } elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update', 
+                       'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add'])) {
+                       $data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
+                       if (empty($data)) {
+                               throw new HTTPException\NotFoundException();
+                       }
+                       if ($parameters['activity'] != 'Create') {
+                               $data['type'] = $parameters['activity'];
+                               $data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
+                       }
+               } else {
                        throw new HTTPException\NotFoundException();
                }
 
-               $data = ['@context' => ActivityPub::CONTEXT];
-               $data = array_merge($data, $activity['object']);
-
                // Relaxed CORS header for public items
                header('Access-Control-Allow-Origin: *');
                System::jsonExit($data, 'application/activity+json');

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index a7e4a738403dbb413b562872696fcead781e225b..9cb5efca413038ce9aef3538a5aae04a019be66c 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -729,7 +729,7 @@ class Transmitter
                        $data = [];
                }
 
-               $data['id'] = $mail['uri'] . '#Create';
+               $data['id'] = $mail['uri'] . '/Create';
                $data['type'] = 'Create';
                $data['actor'] = $mail['author-link'];
                $data['published'] = DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM);
@@ -893,7 +893,7 @@ class Transmitter
                        $data = [];
                }
 
-               $data['id'] = $item['uri'] . '#' . $type;
+               $data['id'] = $item['uri'] . '/' . $type;
                $data['type'] = $type;
 
                if (Item::isForumPost($item) && ($type != 'Announce')) {

diff --git a/static/routes.config.php b/static/routes.config.php
index 85ec6d8bb49bec61f8930f74cccd4a9af52d5bfb..9fbe358830ada94a3fdb6663a6215224934cd419 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -218,7 +218,7 @@ return [
                '/mark/all' => [Module\Notifications\Notification::class, [R::GET]],
                '/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET, R::POST]],
        ],
-       '/objects/{guid}' => [Module\Objects::class, [R::GET]],
+       '/objects/{guid}[/{activity}]' => [Module\Objects::class, [R::GET]],
 
        '/oembed'         => [
                '/b2h'    => [Module\Oembed::class, [R::GET]],