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

Merge pull request #9308 from annando/duplicate-reshare 

Don't display a resharer that was the causer of the post
This commit is contained in:
Tobias Diekershoff 2020-09-28 14:31:32 +02:00 committed by GitHub
parent 584383101a 90e0cae84e
commit 6ee8aa889c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/conversation.php
View File

@ -1005,6 +1005,14 @@ function builtin_activity_puller($item, &$conv_responses) {
continue; continue;
} }
// Skip when the causer of the parent is the same than the author of the announce
if ($verb == Activity::ANNOUNCE) {
$parent = Item::selectFirst(['causer-id', 'gravity'], ['uri' => $item['thr-parent']]);
if (($parent['causer-id'] == $item['author-id']) && ($parent['gravity'] == GRAVITY_PARENT)) {
continue;
}
}
if (!isset($conv_responses[$mode][$item['thr-parent']])) { if (!isset($conv_responses[$mode][$item['thr-parent']])) {
$conv_responses[$mode][$item['thr-parent']] = 1; $conv_responses[$mode][$item['thr-parent']] = 1;
} else { } else {