tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Never mention yourself in AP messages

Browse source
This commit is contained in:
Hypolite Petovan 2020-11-08 14:21:08 -05:00
parent f4da50063a
commit 4b090c2c08
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1425,7 +1425,7 @@ class Transmitter
} }
if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) { if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
$body = self::prependMentions($body, $item['uri-id']); $body = self::prependMentions($body, $item['uri-id'], $item['author-link']);
} }
if ($type == 'Event') { if ($type == 'Event') {
@ -1973,7 +1973,7 @@ class Transmitter
return HTTPSignature::transmit($signed, $profile['inbox'], $uid); return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
} }
private static function prependMentions($body, int $uriid) private static function prependMentions($body, int $uriid, string $authorLink)
{ {
$mentions = []; $mentions = [];
@ -1983,6 +1983,7 @@ class Transmitter
&& $profile['contact-type'] != Contact::TYPE_COMMUNITY && $profile['contact-type'] != Contact::TYPE_COMMUNITY
&& !strstr($body, $profile['addr']) && !strstr($body, $profile['addr'])
&& !strstr($body, $tag['url']) && !strstr($body, $tag['url'])
&& $tag['url'] !== $authorLink
) { ) {
$mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]'; $mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]';
} }