bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Don't show a reshare in the top of a message if we know the author

Browse source
This commit is contained in:
Michael 2019-04-19 07:47:00 +00:00
parent a65a30b303
commit 0d49d0593d
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/conversation.php
View file

@ -800,6 +800,7 @@ function conversation_fetch_comments($thread_items) {
$lineno = 0; $lineno = 0;
$actor = []; $actor = [];
$created = ''; $created = '';
$knownauthor = false;
while ($row = Item::fetch($thread_items)) { while ($row = Item::fetch($thread_items)) {
if (($row['verb'] == ACTIVITY2_ANNOUNCE) && !empty($row['contact-uid']) && ($row['created'] > $created) && ($row['thr-parent'] == $row['parent-uri'])) { if (($row['verb'] == ACTIVITY2_ANNOUNCE) && !empty($row['contact-uid']) && ($row['created'] > $created) && ($row['thr-parent'] == $row['parent-uri'])) {
@ -808,6 +809,11 @@ function conversation_fetch_comments($thread_items) {
} }
if ($row['gravity'] == GRAVITY_PARENT) { if ($row['gravity'] == GRAVITY_PARENT) {
$parentlines[] = $lineno; $parentlines[] = $lineno;
// We could have several parents, so it has to be done this way.
if (!empty($row['contact-uid']) && in_array($row['network'], Protocol::NATIVE_SUPPORT)) {
$knownauthor = true;
}
} }
$comments[] = $row; $comments[] = $row;
@ -816,7 +822,7 @@ function conversation_fetch_comments($thread_items) {
DBA::close($thread_items); DBA::close($thread_items);
if (!empty($actor)) { if (!$knownauthor && !empty($actor)) {
foreach ($parentlines as $line) { foreach ($parentlines as $line) {
if (!in_array($comments[$line]['network'], [Protocol::DIASPORA]) && !$comments[$line]['origin']) { if (!in_array($comments[$line]['network'], [Protocol::DIASPORA]) && !$comments[$line]['origin']) {
$comments[$line]['owner-link'] = $actor['link']; $comments[$line]['owner-link'] = $actor['link'];