From 42dcd6646e495e081a2487cddb3b51d39cbbd5bc Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 8 Sep 2020 22:06:10 +0000
Subject: [PATCH] Issue 9135: Display only reshared posts at the top

---
 include/conversation.php                  | 1 +
 src/Object/Post.php                       | 7 +++++++
 view/theme/frio/css/style.css             | 1 +
 view/theme/frio/templates/wall_thread.tpl | 4 +---
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 0baf4a819..93c7fb406 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -758,6 +758,7 @@ function conversation_fetch_comments($thread_items, $pinned) {
 	if (!empty($direction)) {
 		foreach ($parentlines as $line) {
 			$comments[$line]['direction'] = $direction;
+			$comments[$line]['reshared'] = DI::l10n()->t('%s reshared this.', $actor['name']);
 			if (!empty($actor) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')  ) {
 				$comments[$line]['owner-link'] = $actor['link'];
 				$comments[$line]['owner-avatar'] = $actor['avatar'];
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 0f2a0c651..788fdedde 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -419,6 +419,12 @@ class Post
 			}
 		}
 
+		if (!empty($item['reshared'])) {
+			$reshared = $item['reshared'];
+		} else {
+			$reshared = '';
+		}
+
 		$tmp_item = [
 			'template'        => $this->getTemplate(),
 			'type'            => implode("", array_slice(explode("/", $item['verb']), -1)),
@@ -497,6 +503,7 @@ class Post
 			'uriid'           => $item['uri-id'],
 			'return'          => (DI::args()->getCommand()) ? bin2hex(DI::args()->getCommand()) : '',
 			'direction'       => $direction,
+			'reshared'        => $reshared,
 			'delivery'        => [
 				'queue_count'       => $item['delivery_queue_count'],
 				'queue_done'        => $item['delivery_queue_done'] + $item['delivery_queue_failed'], /// @todo Possibly display it separately in the future
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 95e551f94..12aa1df85 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1985,6 +1985,7 @@ ul.dropdown-menu li:hover {
 }
 
 /* Media Classes */
+.wall-item-ammounce,
 .media .time,
 .media .shared-time,
 .media .delivery,
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 6e8e013dc..a4f980827 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -81,7 +81,7 @@ as the value of $top_child_total (this is done at the end of this file)
 <span class="uriid" style="display: none;">{{$item.uriid}}</span>
 {{/if}}
 	<div class="media {{$item.shiny}}">
-	{{if $item.responses.announce && $mode != 'display'}}
+	{{if $item.reshared}}
 		<div class="wall-item-ammounce wall-item-responses" id="wall-item-ammounce-{{$item.id}}">{{$item.responses.announce.output nofilter}}</div>
 	{{/if}}
 		{{* The avatar picture and the photo-menu *}}
@@ -530,9 +530,7 @@ as the value of $top_child_total (this is done at the end of this file)
 	{{if $item.responses}}
 		<div class="wall-item-responses">
 			{{foreach $item.responses as $verb=>$response}}
-				{{if $verb != 'announce' || $mode == 'display'}}
 			<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
-				{{/if}}
 			{{/foreach}}
 		</div>
 	{{/if}}