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

Merge pull request #9571 from MrPetovan/bug/9549-photo-remove-activity

Browse source 
Move unicity check after array initilization in builtin_activity_puller()
This commit is contained in:
Michael Vogel 2020-11-21 22:36:09 +01:00 committed by GitHub
parent c423fa29ee a16d46b0d7
commit 2dd56bcb0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/conversation.php
View file

@ -1034,11 +1034,6 @@ function builtin_activity_puller(array $activity, array &$conv_responses)
$activity['thr-parent'] = $activity['parent-uri']; $activity['thr-parent'] = $activity['parent-uri'];
} }
// only list each unique author once
if (in_array($link, $conv_responses[$mode][$activity['thr-parent']]['links'])) {
continue;
}
// Skip when the causer of the parent is the same than the author of the announce // Skip when the causer of the parent is the same than the author of the announce
if (($verb == Activity::ANNOUNCE) && Item::exists(['uri' => $activity['thr-parent'], if (($verb == Activity::ANNOUNCE) && Item::exists(['uri' => $activity['thr-parent'],
'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => GRAVITY_PARENT])) { 'uid' => $activity['uid'], 'causer-id' => $activity['author-id'], 'gravity' => GRAVITY_PARENT])) {
@ -1050,6 +1045,9 @@ function builtin_activity_puller(array $activity, array &$conv_responses)
'links' => [], 'links' => [],
'self' => 0, 'self' => 0,
]; ];
} elseif (in_array($link, $conv_responses[$mode][$activity['thr-parent']]['links'])) {
// only list each unique author once
continue;
} }
if (public_contact() == $activity['author-id']) { if (public_contact() == $activity['author-id']) {