keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8592 from annando/issue-8586

Browse source 
Issue 8586: Reduce the amount of item receivers
This commit is contained in:
Hypolite Petovan 2020-05-06 12:04:33 -04:00 committed by GitHub
commit 59d0bc5b5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Protocol/Diaspora.php
View file

@ -252,24 +252,26 @@ class Diaspora
* One of the parameters is a contact array. * One of the parameters is a contact array.
* This is done to avoid duplicates. * This is done to avoid duplicates.
* *
* @param array $parent The parent post * @param array $item Item that is about to be delivered
* @param array $contacts The previously fetched contacts * @param array $contacts The previously fetched contacts
* *
* @return array of relay servers * @return array of relay servers
* @throws \Exception * @throws \Exception
*/ */
public static function participantsForThread(array $parent, array $contacts) public static function participantsForThread(array $item, array $contacts)
{ {
if (!in_array($parent['private'], [Item::PUBLIC, Item::UNLISTED])) { if (!in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]) || in_array($item["verb"], [Activity::FOLLOW, Activity::TAG])) {
return $contacts; return $contacts;
} }
$items = Item::select(['author-id'], ['parent' => $parent['id']], ['group_by' => ['author-id']]); $items = Item::select(['author-id', 'author-link', 'parent-author-link', 'parent-guid'],
['parent' => $item['parent'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
while ($item = DBA::fetch($items)) { while ($item = DBA::fetch($items)) {
$contact = DBA::selectFirst('contact', ['id', 'url', 'name', 'protocol', 'batch', 'network'], $contact = DBA::selectFirst('contact', ['id', 'url', 'name', 'protocol', 'batch', 'network'],
['id' => $item['author-id']]); ['id' => $item['author-id']]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact) || empty($contact['batch']) ||
// Shouldn't happen ($contact['network'] != Protocol::DIASPORA) ||
Strings::compareLink($item['parent-author-link'], $item['author-link'])) {
continue; continue;
} }
@ -281,7 +283,7 @@ class Diaspora
} }
if (!$exists) { if (!$exists) {
Logger::info('Add participant to receiver list', ['item' => $parent['guid'], 'participant' => $contact['url']]); Logger::info('Add participant to receiver list', ['parent' => $item['parent-guid'], 'item' => $item['guid'], 'participant' => $contact['url']]);
$contacts[] = $contact; $contacts[] = $contact;
} }
} }

2
src/Worker/Notifier.php
View file

@ -437,7 +437,7 @@ class Notifier
// Fetch the participation list // Fetch the participation list
// The function will ensure that there are no duplicates // The function will ensure that there are no duplicates
$relay_list = Diaspora::participantsForThread($parent, $relay_list); $relay_list = Diaspora::participantsForThread($target_item, $relay_list);
// Add the relay to the list, avoid duplicates. // Add the relay to the list, avoid duplicates.
// Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly. // Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly.