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

Merge pull request #9309 from annando/reshare-info 

Improve resharer information
This commit is contained in:
Tobias Diekershoff 2020-09-28 16:52:31 +02:00 committed by GitHub
parent 6ee8aa889c 415a3a7926
commit 41b4d23853
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

6
include/conversation.php
View File

@ -1006,12 +1006,10 @@ function builtin_activity_puller($item, &$conv_responses) {
}
// 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)) {
if (($verb == Activity::ANNOUNCE) && Item::exists(['uri' => $item['thr-parent'],
'uid' => $item['uid'], 'causer-id' => $item['author-id'], 'gravity' => GRAVITY_PARENT])) {
continue;
}
}
if (!isset($conv_responses[$mode][$item['thr-parent']])) {
$conv_responses[$mode][$item['thr-parent']] = 1;