bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #9109 from annando/activity-id

Browse source 
Don't add the type to the id in case of an activity
This commit is contained in:
Hypolite Petovan 2020-09-01 00:47:24 -04:00 committed by GitHub
commit c381707dad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Objects.php
View file

@ -47,7 +47,7 @@ class Objects extends BaseModule
DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString())); DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
} }
$item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid'], $item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity'],
['guid' => $parameters['guid']], ['order' => ['origin' => true]]); ['guid' => $parameters['guid']], ['order' => ['origin' => true]]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
@ -80,7 +80,7 @@ class Objects extends BaseModule
$last_modified = $item['changed']; $last_modified = $item['changed'];
Network::checkEtagModified($etag, $last_modified); Network::checkEtagModified($etag, $last_modified);
if (empty($parameters['activity'])) { if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true); $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type']; $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
@ -92,12 +92,12 @@ class Objects extends BaseModule
$data = ['@context' => ActivityPub::CONTEXT]; $data = ['@context' => ActivityPub::CONTEXT];
$data = array_merge($data, $activity['object']); $data = array_merge($data, $activity['object']);
} elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update', } elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update',
'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add'])) { 'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add', ''])) {
$data = ActivityPub\Transmitter::createActivityFromItem($item['id']); $data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
if (empty($data)) { if (empty($data)) {
throw new HTTPException\NotFoundException(); throw new HTTPException\NotFoundException();
} }
if ($parameters['activity'] != 'Create') { if (!in_array($parameters['activity'], ['Create', ''])) {
$data['type'] = $parameters['activity']; $data['type'] = $parameters['activity'];
$data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']); $data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
} }

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

@ -981,7 +981,12 @@ class Transmitter
$data = []; $data = [];
} }
if (($item['gravity'] == GRAVITY_ACTIVITY) && ($type != 'Undo')) {
$data['id'] = $item['uri'];
} else {
$data['id'] = $item['uri'] . '/' . $type; $data['id'] = $item['uri'] . '/' . $type;
}
$data['type'] = $type; $data['type'] = $type;
if (($type != 'Announce') || ($item['gravity'] != GRAVITY_PARENT)) { if (($type != 'Announce') || ($item['gravity'] != GRAVITY_PARENT)) {