sforkowany z mirror/friendica
Merge pull request #7917 from annando/no-mention-on-private
Fix: Don't automatically mention a post creator on private posts2022.09-rc
commit
916af997c6
|
@ -381,16 +381,16 @@ class Transmitter
|
||||||
|
|
||||||
$terms = Term::tagArrayFromItemId($item['id'], [Term::MENTION, Term::IMPLICIT_MENTION]);
|
$terms = Term::tagArrayFromItemId($item['id'], [Term::MENTION, Term::IMPLICIT_MENTION]);
|
||||||
|
|
||||||
// Directly mention the original author upon a quoted reshare.
|
|
||||||
// Else just ensure that the original author receives the reshare.
|
|
||||||
$announce = self::getAnnounceArray($item);
|
|
||||||
if (!empty($announce['comment'])) {
|
|
||||||
$data['to'][] = $announce['actor']['url'];
|
|
||||||
} elseif (!empty($announce)) {
|
|
||||||
$data['cc'][] = $announce['actor']['url'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$item['private']) {
|
if (!$item['private']) {
|
||||||
|
// Directly mention the original author upon a quoted reshare.
|
||||||
|
// Else just ensure that the original author receives the reshare.
|
||||||
|
$announce = self::getAnnounceArray($item);
|
||||||
|
if (!empty($announce['comment'])) {
|
||||||
|
$data['to'][] = $announce['actor']['url'];
|
||||||
|
} elseif (!empty($announce)) {
|
||||||
|
$data['cc'][] = $announce['actor']['url'];
|
||||||
|
}
|
||||||
|
|
||||||
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
|
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
|
||||||
|
|
||||||
$data['to'][] = ActivityPub::PUBLIC_COLLECTION;
|
$data['to'][] = ActivityPub::PUBLIC_COLLECTION;
|
||||||
|
|
Ładowanie…
Reference in New Issue