X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=c668e53d9da656d3549c6328d54f7c86f6d0510f;hb=4841ac7dc57830f1d50e29f371afdd8f6af449a4;hp=01139a2cb9d928400ec9e8ca48638a0054fff9fd;hpb=129b690b9a799528c41a45859ef8778b6f7943ef;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 01139a2cb9..c668e53d9d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -711,15 +711,29 @@ function conversation_fetch_comments($thread_items, $pinned) {
 	$parentlines = [];
 	$lineno = 0;
 	$direction = [];
+	$actor = [];
+	$received = '';
 
 	while ($row = Item::fetch($thread_items)) {
-		if (($row['verb'] == Activity::ANNOUNCE) && ($row['thr-parent'] == $row['parent-uri'])
+		if (!empty($parentlines) && ($row['verb'] == Activity::ANNOUNCE)
+			&& ($row['thr-parent'] == $row['parent-uri']) && ($row['received'] > $received)
 			&& Contact::isSharing($row['author-id'], $row['uid'])) {
-			$direction = ['direction' => 3, 'title' => DI::l10n()->t('Reshared')];
+			$direction = ['direction' => 3, 'title' => DI::l10n()->t('%s reshared this.', $row['author-name'])];
+			$actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
+			$received = $row['received'];
+		}
+
+		if (!empty($parentlines) && 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'])
 			&& !Contact::isSharing($row['author-id'], $row['uid'])) {
+			if ($row['post-type'] == Item::PT_TAG) {
+				$row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
+			}
+		
 			$parentlines[] = $lineno;
 		}
 
@@ -736,6 +750,11 @@ function conversation_fetch_comments($thread_items, $pinned) {
 	if (!empty($direction)) {
 		foreach ($parentlines as $line) {
 			$comments[$line]['direction'] = $direction;
+			if (!empty($actor) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')  ) {
+				$comments[$line]['owner-link'] = $actor['link'];
+				$comments[$line]['owner-avatar'] = $actor['avatar'];
+				$comments[$line]['owner-name'] = $actor['name'];
+			}
 		}
 	}
 	return $comments;
@@ -802,7 +821,7 @@ function conversation_fetch_items(array $parent, array $items, array $condition,
 		$condition[0] .= " AND NOT `author`.`hidden`";
 	}
 
-	$thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity']), $condition, $params);
+	$thread_items = Item::selectForUser(local_user(), array_merge(Item::DISPLAY_FIELDLIST, ['contact-uid', 'gravity', 'post-type']), $condition, $params);
 
 	$comments = conversation_fetch_comments($thread_items, $parent['pinned'] ?? false);