clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11332 from annando/receivers2 

Don't send forum posts to the user's followers
This commit is contained in:
Tobias Diekershoff 2022-03-14 09:41:42 +01:00 committed by GitHub
parent 5a4b97b0e6 0956d1dd64
commit b98243826f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Protocol/ActivityPub/Transmitter.php
View File

@ -427,12 +427,13 @@ class Transmitter
* Returns an array with permissions of the thread parent of the given item array * Returns an array with permissions of the thread parent of the given item array
* *
* @param array $item * @param array $item
* @param bool $is_forum_thread
* *
* @return array with permissions * @return array with permissions
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function fetchPermissionBlockFromThreadParent($item) private static function fetchPermissionBlockFromThreadParent(array $item, bool $is_forum_thread)
{ {
if (empty($item['thr-parent-id'])) { if (empty($item['thr-parent-id'])) {
return []; return [];
@ -462,7 +463,9 @@ class Transmitter
$type = [Tag::TO => 'to', Tag::CC => 'cc', Tag::BTO => 'bto', Tag::BCC => 'bcc']; $type = [Tag::TO => 'to', Tag::CC => 'cc', Tag::BTO => 'bto', Tag::BCC => 'bcc'];
foreach (Tag::getByURIId($item['thr-parent-id'], [Tag::TO, Tag::CC, Tag::BTO, Tag::BCC]) as $receiver) { foreach (Tag::getByURIId($item['thr-parent-id'], [Tag::TO, Tag::CC, Tag::BTO, Tag::BCC]) as $receiver) {
if (!empty($parent_profile['followers']) && $receiver['url'] == $parent_profile['followers'] && !empty($item_profile['followers'])) { if (!empty($parent_profile['followers']) && $receiver['url'] == $parent_profile['followers'] && !empty($item_profile['followers'])) {
if (!$is_forum_thread) {
$permissions[$type[$receiver['type']]][] = $item_profile['followers']; $permissions[$type[$receiver['type']]][] = $item_profile['followers'];
}
} elseif (!in_array($receiver['url'], $exclude)) { } elseif (!in_array($receiver['url'], $exclude)) {
$permissions[$type[$receiver['type']]][] = $receiver['url']; $permissions[$type[$receiver['type']]][] = $receiver['url'];
} }
@ -523,6 +526,14 @@ class Transmitter
$always_bcc = true; $always_bcc = true;
} }
$parent = Post::selectFirst(['causer-link', 'post-reason'], ['id' => $item['parent']]);
if (($parent['post-reason'] == Item::PR_ANNOUNCEMENT) && !empty($parent['causer-link'])) {
$profile = APContact::getByURL($parent['causer-link'], false);
$is_forum_thread = ($profile['type'] == 'Group');
} else {
$is_forum_thread = false;
}
if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery') || self::isAPPost($last_id)) { if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery') || self::isAPPost($last_id)) {
// Will be activated in a later step // Will be activated in a later step
$networks = Protocol::FEDERATED; $networks = Protocol::FEDERATED;
@ -553,7 +564,7 @@ class Transmitter
$data['cc'][] = $announce['actor']['url']; $data['cc'][] = $announce['actor']['url'];
} }
$data = array_merge($data, self::fetchPermissionBlockFromThreadParent($item)); $data = array_merge($data, self::fetchPermissionBlockFromThreadParent($item, $is_forum_thread));
// Check if the item is completely public or unlisted // Check if the item is completely public or unlisted
if ($item['private'] == Item::PUBLIC) { if ($item['private'] == Item::PUBLIC) {
@ -618,17 +629,10 @@ class Transmitter
} }
} }
$is_forum_thread = false;
if (!empty($item['parent'])) { if (!empty($item['parent'])) {
$parents = Post::select(['id', 'author-link', 'owner-link', 'causer-link', 'gravity', 'uri', 'post-reason'], ['parent' => $item['parent']], ['order' => ['id']]); $parents = Post::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']], ['order' => ['id']]);
while ($parent = Post::fetch($parents)) { while ($parent = Post::fetch($parents)) {
if ($parent['gravity'] == GRAVITY_PARENT) { if ($parent['gravity'] == GRAVITY_PARENT) {
if (($parent['post-reason'] == Item::PR_ANNOUNCEMENT) && !empty($parent['causer-link'])) {
$profile = APContact::getByURL($parent['causer-link'], false);
$is_forum_thread = ($profile['type'] == 'Group');
}
$profile = APContact::getByURL($parent['owner-link'], false); $profile = APContact::getByURL($parent['owner-link'], false);
if (!empty($profile)) { if (!empty($profile)) {
if ($item['gravity'] != GRAVITY_PARENT) { if ($item['gravity'] != GRAVITY_PARENT) {