Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 11:44:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7153 from annando/ap-mail-delivery

Browse source 
Fix receiver list for mails
This commit is contained in:
Hypolite Petovan 2019-05-18 11:50:10 -04:00 • committed by GitHub
commit fc312e4c98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -422,46 +422,48 @@ class Transmitter
}
}
$parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
while ($parent = Item::fetch($parents)) {
if ($parent['gravity'] == GRAVITY_PARENT) {
$profile = APContact::getByURL($parent['owner-link'], false);
if (!empty($profile)) {
if ($item['gravity'] != GRAVITY_PARENT) {
// Comments to forums are directed to the forum
// But comments to forums aren't directed to the followers collection
if ($profile['type'] == 'Group') {
$data['to'][] = $profile['url'];
if (!empty($item['parent'])) {
$parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
while ($parent = Item::fetch($parents)) {
if ($parent['gravity'] == GRAVITY_PARENT) {
$profile = APContact::getByURL($parent['owner-link'], false);
if (!empty($profile)) {
if ($item['gravity'] != GRAVITY_PARENT) {
// Comments to forums are directed to the forum
// But comments to forums aren't directed to the followers collection
if ($profile['type'] == 'Group') {
$data['to'][] = $profile['url'];
} else {
$data['cc'][] = $profile['url'];
if (!$item['private']) {
$data['cc'][] = $actor_profile['followers'];
}
}
} else {
$data['cc'][] = $profile['url'];
if (!$item['private']) {
// Public thread parent post always are directed to the followers
if (!$item['private'] && !$forum_mode) {
$data['cc'][] = $actor_profile['followers'];
}
}
}
}
// Don't include data from future posts
if ($parent['id'] >= $last_id) {
continue;
}
$profile = APContact::getByURL($parent['author-link'], false);
if (!empty($profile)) {
if (($profile['type'] == 'Group') || ($parent['uri'] == $item['thr-parent'])) {
$data['to'][] = $profile['url'];
} else {
// Public thread parent post always are directed to the followes
if (!$item['private'] && !$forum_mode) {
$data['cc'][] = $actor_profile['followers'];
}
$data['cc'][] = $profile['url'];
}
}
}
// Don't include data from future posts
if ($parent['id'] >= $last_id) {
continue;
}
$profile = APContact::getByURL($parent['author-link'], false);
if (!empty($profile)) {
if (($profile['type'] == 'Group') || ($parent['uri'] == $item['thr-parent'])) {
$data['to'][] = $profile['url'];
} else {
$data['cc'][] = $profile['url'];
}
}
DBA::close($parents);
}
DBA::close($parents);
$data['to'] = array_unique($data['to']);
$data['cc'] = array_unique($data['cc']);