Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't deliver/accept group boosted comments

Browse source
This commit is contained in:
nobody 2021-06-23 16:56:49 -07:00
parent 88cbfaee67
commit ef95335e7e
3 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Zotlabs/Daemon/Notifier.php
View file

@ -715,10 +715,15 @@ class Notifier {
// default: zot protocol
// Prevent zot6 delivery of group comment boosts, which are not required for conversational platform.
// Other non-zot6 conversational platforms may need to filter these if they don't want them.
// Prevent zot6 delivery of group comment boosts, which are not required for conversational platforms.
// ActivityPub conversational platforms may wish to filter these if they don't want or require them.
// We will assume here that if $target_item exists and has a verb that it is an actual item structure
// so we won't need to check the existence of the other item fields prior to evaluation.
// This shouldn't produce false positives on comment boosts that were generated on other platforms
// because we won't be delivering them.
if (isset($target_item) && isset($target_item['verb']) && $target_item['verb'] === 'Announce' && $target_item['author_xchan'] === $target_item['owner_xchan']) {
if (isset($target_item) && isset($target_item['verb']) && $target_item['verb'] === 'Announce' && $target_item['author_xchan'] === $target_item['owner_xchan'] && $target_item['thr_parent'] !== $target_item['parent_mid']) {
continue;
}

24
Zotlabs/Lib/Activity.php
View file

@ -2600,7 +2600,11 @@ class Activity {
// ensure we store the original actor
self::actor_store($act->actor['id'],$act->actor);
$s['mid'] = $act->obj['id'];
$s['mid'] = ((is_array($act->obj) && isset($act->obj['id'])) ? $act->obj['id'] : $act->obj);
if (! $s['mid']) {
return false;
}
$s['parent_mid'] = $act->parent_id;
if (array_key_exists('published',$act->data) && $act->data['published']) {
@ -2622,7 +2626,7 @@ class Activity {
$s['expires'] = datetime_convert('UTC','UTC',$act->obj['expires']);
}
if ($act->type === 'Invite' && array_key_exists('type',$act->obj) && $act->obj['type'] === 'Event') {
if ($act->type === 'Invite' && is_array($act->obj) && array_key_exists('type',$act->obj) && $act->obj['type'] === 'Event') {
$s['mid'] = $s['parent_mid'] = $act->id;
}
@ -2640,7 +2644,7 @@ class Activity {
$response_activity = true;
$s['mid'] = $act->id;
$s['parent_mid'] = $act->obj['id'];
$s['parent_mid'] = ((is_array($act->obj) && isset($act->obj['id'])) ? $act->obj['id'] : $act->obj);
// over-ride the object timestamp with the activity
@ -3305,6 +3309,18 @@ class Activity {
if ($p) {
// set the owner to the owner of the parent
$item['owner_xchan'] = $p[0]['owner_xchan'];
// quietly reject group comment boosts by group owner
// (usually only sent via ActivityPub so groups will work on microblog platforms)
// This catches those activities if they slipped in via a conversation fetch
if ($p[0]['parent_mid'] !== $item['parent_mid']) {
if ($item['verb'] === 'Announce' && $item['author_xchan'] === $item['owner_xchan']) {
logger('group boost activity by group owner rejected');
return;
}
}
// check permissions against the author, not the sender
$allowed = perm_is_allowed($channel['channel_id'],$item['author_xchan'],'post_comments');
if (! $allowed) {
@ -3323,7 +3339,7 @@ class Activity {
$allowed = false;
$reason[] = 'absolutely';
}
if (! $allowed) {
logger('rejected comment from ' . $item['author_xchan'] . ' for ' . $channel['channel_address']);
logger('rejected reason ' . print_r($reason,true));

2
Zotlabs/Lib/Libzot.php
View file

@ -1302,8 +1302,6 @@ class Libzot {
}
$deliveries = null;
if (array_key_exists('recipients',$env) && count($env['recipients'])) {