From 15119f6a593ee88cf0ad66a0f814961f548b8d3f Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 23 Aug 2020 14:51:56 +0000 Subject: [PATCH] Added information about fetched post because of comment --- include/conversation.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 3d1aeddab..447874584 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -711,11 +711,17 @@ function conversation_fetch_comments($thread_items, $pinned) { $parentlines = []; $lineno = 0; $direction = []; + $received = ''; while ($row = Item::fetch($thread_items)) { if (($row['verb'] == Activity::ANNOUNCE) && ($row['thr-parent'] == $row['parent-uri']) - && Contact::isSharing($row['author-id'], $row['uid'])) { + && ($row['received'] > $received) && Contact::isSharing($row['author-id'], $row['uid'])) { $direction = ['direction' => 3, 'title' => DI::l10n()->t('%s reshared this.', $row['author-name'])]; + $received = $row['received']; + } + + if (empty($direction) && ($row['gravity'] == GRAVITY_COMMENT) && Contact::isSharing($row['author-id'], $row['uid'])) { + $direction = ['direction' => 2, 'title' => DI::l10n()->t('%s commented this.', $row['author-name'])]; } if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])