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

ignore "follow" activities that are not from the user

This commit is contained in:
Michael 2020-05-06 21:19:48 +00:00
parent be9519708e
commit 065fad31f1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/Item.php
View File

@ -1994,7 +1994,8 @@ class Item
if ($transmit) {
$transmit_item = Item::selectFirst(['verb', 'origin'], ['id' => $item['id']]);
// Don't relay participation messages
if (($transmit_item['verb'] == Activity::FOLLOW) && !$transmit_item['origin']) {
if (($transmit_item['verb'] == Activity::FOLLOW) &&
(!$transmit_item['origin'] || ($item['author-id'] != Contact::getPublicIdByUserId($uid)))) {
Logger::info('Participation messages will not be relayed', ['item' => $item['id'], 'uri' => $item['uri'], 'verb' => $transmit_item['verb']]);
$transmit = false;
}