keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10076 from annando/ap-delete

Browse source 
Delete ActivityPub comments
This commit is contained in:
Hypolite Petovan 2021-03-24 18:56:55 -04:00 committed by GitHub
commit 9bd92ff812
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Item.php
View file

@ -241,7 +241,7 @@ class Item
if ($item['uid'] == $uid) { if ($item['uid'] == $uid) {
self::markForDeletionById($item['id'], PRIORITY_HIGH); self::markForDeletionById($item['id'], PRIORITY_HIGH);
} elseif ($item['uid'] != 0) { } elseif ($item['uid'] != 0) {
Logger::log('Wrong ownership. Not deleting item ' . $item['id']); Logger::notice('Wrong ownership. Not deleting item', ['id' => $item['id']]);
} }
} }
DBA::close($items); DBA::close($items);

14
src/Module/Objects.php
View file

@ -69,7 +69,7 @@ class Objects extends BaseModule
} }
} }
$item = Post::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity'], $item = Post::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity', 'deleted', 'parent-uri-id'],
['uri-id' => $itemuri['id']], ['order' => ['origin' => true]]); ['uri-id' => $itemuri['id']], ['order' => ['origin' => true]]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
@ -93,8 +93,16 @@ class Objects extends BaseModule
} }
} }
// Valid items are original post or posted from this node (including in the case of a forum) if ($validated) {
if (!$validated || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) { // Valid items are original post or posted from this node (including in the case of a forum)
$validated = ($item['origin'] || (parse_url($item['author-link'], PHP_URL_HOST) == parse_url(DI::baseUrl()->get(), PHP_URL_HOST)));
if (!$validated && $item['deleted']) {
$validated = Post::exists(['origin' => true, 'uri-id' => $item['parent-uri-id']]);
}
}
if (!$validated) {
throw new HTTPException\NotFoundException(); throw new HTTPException\NotFoundException();
} }

9
src/Object/Post.php
View file

@ -214,13 +214,8 @@ class Post
$pinned = DI::l10n()->t('pinned item'); $pinned = DI::l10n()->t('pinned item');
} }
if ($origin && ($item['gravity'] != GRAVITY_PARENT) && ($item['network'] == Protocol::ACTIVITYPUB)) { // Showing the one or the other text, depending upon if we can only hide it or really delete it.
// ActivityPub doesn't allow removal of remote comments $delete = $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally');
$delete = DI::l10n()->t('Delete locally');
} else {
// Showing the one or the other text, depending upon if we can only hide it or really delete it.
$delete = $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally');
}
$drop = false; $drop = false;
$block = false; $block = false;

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

@ -1069,25 +1069,27 @@ class Transmitter
return false; return false;
} }
$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB]; if (!$item['deleted']) {
$conversation = DBA::selectFirst('conversation', ['source'], $condition); $condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
if (!$item['origin'] && DBA::isResult($conversation)) { $conversation = DBA::selectFirst('conversation', ['source'], $condition);
$data = json_decode($conversation['source'], true); if (!$item['origin'] && DBA::isResult($conversation)) {
if (!empty($data['type'])) { $data = json_decode($conversation['source'], true);
if (in_array($data['type'], ['Create', 'Update'])) { if (!empty($data['type'])) {
if ($object_mode) { if (in_array($data['type'], ['Create', 'Update'])) {
unset($data['@context']); if ($object_mode) {
unset($data['signature']); unset($data['@context']);
unset($data['signature']);
}
Logger::info('Return stored conversation', ['item' => $item_id]);
return $data;
} elseif (in_array('as:' . $data['type'], Receiver::CONTENT_TYPES)) {
if (!empty($data['@context'])) {
$context = $data['@context'];
unset($data['@context']);
}
unset($data['actor']);
$object = $data;
} }
Logger::info('Return stored conversation', ['item' => $item_id]);
return $data;
} elseif (in_array('as:' . $data['type'], Receiver::CONTENT_TYPES)) {
if (!empty($data['@context'])) {
$context = $data['@context'];
unset($data['@context']);
}
unset($data['actor']);
$object = $data;
} }
} }
} }
@ -1106,7 +1108,9 @@ class Transmitter
$data = []; $data = [];
} }
if (($item['gravity'] == GRAVITY_ACTIVITY) && ($type != 'Undo')) { if ($type == 'Delete') {
$data['id'] = Item::newURI($item['uid'], $item['guid']) . '/' . $type;;
} elseif (($item['gravity'] == GRAVITY_ACTIVITY) && ($type != 'Undo')) {
$data['id'] = $item['uri']; $data['id'] = $item['uri'];
} else { } else {
$data['id'] = $item['uri'] . '/' . $type; $data['id'] = $item['uri'] . '/' . $type;