nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

We now use bcc for the acl block

Browse source
This commit is contained in:
Michael 2018-10-24 20:06:57 +00:00
parent 0a790227b6
commit f300c8953a
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -312,7 +312,7 @@ class Transmitter
// For now only send to these contacts: // For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
$data = ['to' => [], 'cc' => []]; $data = ['to' => [], 'cc' => [], 'bcc' => []];
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item)); $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
@ -350,7 +350,7 @@ class Transmitter
foreach ($receiver_list as $receiver) { foreach ($receiver_list as $receiver) {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => $networks]); $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => $networks]);
if (DBA::isResult($contact) && !empty($profile = APContact::getByURL($contact['url'], false))) { if (DBA::isResult($contact) && !empty($profile = APContact::getByURL($contact['url'], false))) {
$data['cc'][] = $profile['url']; $data['bcc'][] = $profile['url'];
} }
} }
} }
@ -384,6 +384,7 @@ class Transmitter
$data['to'] = array_unique($data['to']); $data['to'] = array_unique($data['to']);
$data['cc'] = array_unique($data['cc']); $data['cc'] = array_unique($data['cc']);
$data['bcc'] = array_unique($data['bcc']);
if (($key = array_search($item['author-link'], $data['to'])) !== false) { if (($key = array_search($item['author-link'], $data['to'])) !== false) {
unset($data['to'][$key]); unset($data['to'][$key]);
@ -393,16 +394,33 @@ class Transmitter
unset($data['cc'][$key]); unset($data['cc'][$key]);
} }
if (($key = array_search($item['author-link'], $data['bcc'])) !== false) {
unset($data['bcc'][$key]);
}
foreach ($data['to'] as $to) { foreach ($data['to'] as $to) {
if (($key = array_search($to, $data['cc'])) !== false) { if (($key = array_search($to, $data['cc'])) !== false) {
unset($data['cc'][$key]); unset($data['cc'][$key]);
} }
if (($key = array_search($to, $data['bcc'])) !== false) {
unset($data['bcc'][$key]);
} }
}
foreach ($data['cc'] as $cc) {
if (($key = array_search($cc, $data['bcc'])) !== false) {
unset($data['bcc'][$key]);
}
}
$receivers = ['to' => array_values($data['to']), 'cc' => array_values($data['cc']), 'bcc' => array_values($data['bcc'])];
if (!$blindcopy) { if (!$blindcopy) {
unset($receivers['bcc']);
} }
return ['to' => array_values($data['to']), 'cc' => array_values($data['cc'])]; return $receivers;
} }
/** /**