X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=c668e53d9da656d3549c6328d54f7c86f6d0510f;hb=4841ac7dc57830f1d50e29f371afdd8f6af449a4;hp=8969bfd4b6d215c9c04130b34952fd596dd6c7f6;hpb=1934c149a32cd3844741d531c0c568fbbe192496;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 8969bfd4b6..c668e53d9d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -710,27 +710,31 @@ function conversation_fetch_comments($thread_items, $pinned) {
 	$comments = [];
 	$parentlines = [];
 	$lineno = 0;
+	$direction = [];
 	$actor = [];
 	$received = '';
-	$owner = '';
 
 	while ($row = Item::fetch($thread_items)) {
-		if (($row['verb'] == Activity::ANNOUNCE) && ($row['author-link'] == $owner)) {
-			continue;
-		}
-
-		if (($row['verb'] == Activity::ANNOUNCE) && !empty($row['contact-uid']) && ($row['received'] > $received) && ($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('%s reshared this.', $row['author-name'])];
 			$actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
 			$received = $row['received'];
 		}
 
-		if ((($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && !in_array($row['network'], [Protocol::DIASPORA])) &&
-			(empty($row['contact-uid']) || !in_array($row['network'], Protocol::NATIVE_SUPPORT))) {
-			$parentlines[] = $lineno;
+		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['author-link'] != $row['owner-link'])) {
-			$owner = $row['owner-link'];
+		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;
 		}
 
 		if ($row['gravity'] == GRAVITY_PARENT) {
@@ -743,11 +747,14 @@ function conversation_fetch_comments($thread_items, $pinned) {
 
 	DBA::close($thread_items);
 
-	if (!empty($actor)) {
+	if (!empty($direction)) {
 		foreach ($parentlines as $line) {
-			$comments[$line]['owner-link'] = $actor['link'];
-			$comments[$line]['owner-avatar'] = $actor['avatar'];
-			$comments[$line]['owner-name'] = $actor['name'];
+			$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;
@@ -814,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);