Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 10:23:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13591 from annando/message-distribution

Browse source 
Improve distribution of non public messages
This commit is contained in:
Tobias Diekershoff 2023-10-31 15:42:33 +01:00 committed by GitHub
commit 994e9cf346
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Model/Item.php
View file

@ -1042,10 +1042,12 @@ class Item
// Reshares have to keep their permissions to allow groups to work // Reshares have to keep their permissions to allow groups to work
if (!$defined_permissions && (!$item['origin'] || ($item['verb'] != Activity::ANNOUNCE))) { if (!$defined_permissions && (!$item['origin'] || ($item['verb'] != Activity::ANNOUNCE))) {
$item['allow_cid'] = $toplevel_parent['allow_cid']; // Don't store the permissions on pure AP posts
$item['allow_gid'] = $toplevel_parent['allow_gid']; $store_permissions = ($item['network'] != Protocol::ACTIVITYPUB) || $item['origin'] || !empty($item['diaspora_signed_text']);
$item['deny_cid'] = $toplevel_parent['deny_cid']; $item['allow_cid'] = $store_permissions ? $toplevel_parent['allow_cid'] : '';
$item['deny_gid'] = $toplevel_parent['deny_gid']; $item['allow_gid'] = $store_permissions ? $toplevel_parent['allow_gid'] : '';
$item['deny_cid'] = $store_permissions ? $toplevel_parent['deny_cid'] : '';
$item['deny_gid'] = $store_permissions ? $toplevel_parent['deny_gid'] : '';
} }
$parent_origin = $toplevel_parent['origin']; $parent_origin = $toplevel_parent['origin'];

14
src/Protocol/Diaspora.php
View file

@ -1192,6 +1192,7 @@ class Diaspora
{ {
$fields = [ $fields = [
'id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin', 'id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-name', 'author-link', 'author-avatar', 'gravity', 'author-name', 'author-link', 'author-avatar', 'gravity',
'owner-name', 'owner-link', 'owner-avatar' 'owner-name', 'owner-link', 'owner-avatar'
]; ];
@ -1567,6 +1568,12 @@ class Diaspora
$datarray['verb'] = Activity::POST; $datarray['verb'] = Activity::POST;
$datarray['gravity'] = Item::GRAVITY_COMMENT; $datarray['gravity'] = Item::GRAVITY_COMMENT;
$datarray['private'] = $toplevel_parent_item['private'];
$datarray['allow_cid'] = $toplevel_parent_item['allow_cid'];
$datarray['allow_gid'] = $toplevel_parent_item['allow_gid'];
$datarray['deny_cid'] = $toplevel_parent_item['deny_cid'];
$datarray['deny_gid'] = $toplevel_parent_item['deny_gid'];
$datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri']; $datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri'];
$datarray['object-type'] = Activity\ObjectType::COMMENT; $datarray['object-type'] = Activity\ObjectType::COMMENT;
@ -1823,6 +1830,13 @@ class Diaspora
$datarray['verb'] = $verb; $datarray['verb'] = $verb;
$datarray['gravity'] = Item::GRAVITY_ACTIVITY; $datarray['gravity'] = Item::GRAVITY_ACTIVITY;
$datarray['private'] = $toplevel_parent_item['private'];
$datarray['allow_cid'] = $toplevel_parent_item['allow_cid'];
$datarray['allow_gid'] = $toplevel_parent_item['allow_gid'];
$datarray['deny_cid'] = $toplevel_parent_item['deny_cid'];
$datarray['deny_gid'] = $toplevel_parent_item['deny_gid'];
$datarray['thr-parent'] = $toplevel_parent_item['uri']; $datarray['thr-parent'] = $toplevel_parent_item['uri'];
$datarray['object-type'] = Activity\ObjectType::NOTE; $datarray['object-type'] = Activity\ObjectType::NOTE;

14
src/Worker/Notifier.php
View file

@ -102,7 +102,7 @@ class Notifier
$uid = $target_id; $uid = $target_id;
$condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]]; $condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
$delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'addr', 'network', 'protocol', 'baseurl', 'gsid', 'batch'], $condition); $delivery_contacts_stmt = DBA::select('contact', ['id', 'uri-id', 'url', 'addr', 'network', 'protocol', 'baseurl', 'gsid', 'batch'], $condition);
} else { } else {
$post = Post::selectFirst(['id'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]); $post = Post::selectFirst(['id'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
if (!DBA::isResult($post)) { if (!DBA::isResult($post)) {
@ -191,7 +191,8 @@ class Notifier
$apdelivery = self::activityPubDelivery($cmd, $target_item, $parent, $thr_parent, $a->getQueueValue('priority'), $a->getQueueValue('created'), $owner); $apdelivery = self::activityPubDelivery($cmd, $target_item, $parent, $thr_parent, $a->getQueueValue('priority'), $a->getQueueValue('created'), $owner);
$ap_contacts = $apdelivery['contacts']; $ap_contacts = $apdelivery['contacts'];
$delivery_queue_count += $apdelivery['count']; $delivery_queue_count += $apdelivery['count'];
if (($thr_parent['network'] == Protocol::ACTIVITYPUB) && ($thr_parent['private'] == Item::PRIVATE)) { // Restrict distribution to AP, when there are no permissions.
if (($target_item['private'] == Item::PRIVATE) && empty($target_item['allow_cid']) && empty($target_item['allow_gid']) && empty($target_item['deny_cid']) && empty($target_item['deny_gid'])) {
$only_ap_delivery = true; $only_ap_delivery = true;
$public_message = false; $public_message = false;
$diaspora_delivery = false; $diaspora_delivery = false;
@ -438,7 +439,7 @@ class Notifier
if (!empty($networks)) { if (!empty($networks)) {
$condition['network'] = $networks; $condition['network'] = $networks;
} }
$delivery_contacts_stmt = DBA::select('contact', ['id', 'addr', 'url', 'network', 'protocol', 'baseurl', 'gsid', 'batch'], $condition); $delivery_contacts_stmt = DBA::select('contact', ['id', 'uri-id', 'addr', 'url', 'network', 'protocol', 'baseurl', 'gsid', 'batch'], $condition);
} }
$conversants = []; $conversants = [];
@ -462,7 +463,7 @@ class Notifier
$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false, $condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]; 'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
$contacts = DBA::selectToArray('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol', 'baseurl', 'gsid'], $condition); $contacts = DBA::selectToArray('contact', ['id', 'uri-id', 'url', 'addr', 'name', 'network', 'protocol', 'baseurl', 'gsid'], $condition);
$conversants = array_merge($contacts, $participants); $conversants = array_merge($contacts, $participants);
@ -593,6 +594,11 @@ class Notifier
continue; continue;
} }
if (($contact['network'] == Protocol::ACTIVITYPUB) && !DI::dsprContact()->existsByUriId($contact['uri-id'])) {
Logger::info('The ActivityPub contact does not support Diaspora, so skip delivery via Diaspora', ['id' => $post_uriid, 'uid' => $sender_uid, 'url' => $contact['url']]);
continue;
}
Logger::info('Delivery', ['batch' => $in_batch, 'target' => $post_uriid, 'uid' => $sender_uid, 'guid' => $target_item['guid'] ?? '', 'to' => $contact]); Logger::info('Delivery', ['batch' => $in_batch, 'target' => $post_uriid, 'uid' => $sender_uid, 'guid' => $target_item['guid'] ?? '', 'to' => $contact]);
// Ensure that posts with our own protocol arrives before Diaspora posts arrive. // Ensure that posts with our own protocol arrives before Diaspora posts arrive.