tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8701 from annando/issue-8700

Browse source 
Issue 8700: Resolvable activities
This commit is contained in:
Hypolite Petovan 2020-05-27 15:30:04 -04:00 committed by GitHub
parent c7367b5902 db907c2ff8
commit 9fef3b231d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Module/Objects.php
View file

@ -65,17 +65,31 @@ class Objects extends BaseModule
$last_modified = $item['changed']; $last_modified = $item['changed'];
Network::checkEtagModified($etag, $last_modified); Network::checkEtagModified($etag, $last_modified);
$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true); if (empty($parameters['activity'])) {
$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type']; $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 // Only display "Create" activity objects here, no reshares or anything else
if (empty($activity['object']) || ($activity['type'] != 'Create')) { 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(); throw new HTTPException\NotFoundException();
} }
$data = ['@context' => ActivityPub::CONTEXT];
$data = array_merge($data, $activity['object']);
// Relaxed CORS header for public items // Relaxed CORS header for public items
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
System::jsonExit($data, 'application/activity+json'); System::jsonExit($data, 'application/activity+json');

4
src/Protocol/ActivityPub/Transmitter.php
View file

@ -729,7 +729,7 @@ class Transmitter
$data = []; $data = [];
} }
$data['id'] = $mail['uri'] . '#Create'; $data['id'] = $mail['uri'] . '/Create';
$data['type'] = 'Create'; $data['type'] = 'Create';
$data['actor'] = $mail['author-link']; $data['actor'] = $mail['author-link'];
$data['published'] = DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM); $data['published'] = DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM);
@ -893,7 +893,7 @@ class Transmitter
$data = []; $data = [];
} }
$data['id'] = $item['uri'] . '#' . $type; $data['id'] = $item['uri'] . '/' . $type;
$data['type'] = $type; $data['type'] = $type;
if (Item::isForumPost($item) && ($type != 'Announce')) { if (Item::isForumPost($item) && ($type != 'Announce')) {

2
static/routes.config.php
View file

@ -218,7 +218,7 @@ return [
'/mark/all' => [Module\Notifications\Notification::class, [R::GET]], '/mark/all' => [Module\Notifications\Notification::class, [R::GET]],
'/{id:\d+}' => [Module\Notifications\Notification::class, [R::GET, R::POST]], '/{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' => [ '/oembed' => [
'/b2h' => [Module\Oembed::class, [R::GET]], '/b2h' => [Module\Oembed::class, [R::GET]],