From 42dcd6646e495e081a2487cddb3b51d39cbbd5bc Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 8 Sep 2020 22:06:10 +0000 Subject: [PATCH 1/4] 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 0baf4a819e..93c7fb4061 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 0f2a0c6518..788fdedde6 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 95e551f94c..12aa1df852 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 6e8e013dcc..a4f980827a 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) {{/if}}
- {{if $item.responses.announce && $mode != 'display'}} + {{if $item.reshared}}
{{$item.responses.announce.output nofilter}}
{{/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}}
{{foreach $item.responses as $verb=>$response}} - {{if $verb != 'announce' || $mode == 'display'}}
{{$response.output nofilter}}
- {{/if}} {{/foreach}}
{{/if}} From 206caaf51a1608c59de130bad9d75e7b3d98b2ce Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 Sep 2020 04:49:42 +0000 Subject: [PATCH 2/4] Reshared data now is a link --- include/conversation.php | 19 +++++++++++++------ src/Object/Post.php | 8 +------- view/templates/wall_thread.tpl | 3 +++ view/theme/frio/templates/wall_thread.tpl | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 93c7fb4061..99f3d76b0b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -727,7 +727,12 @@ function conversation_fetch_comments($thread_items, $pinned) { && ($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']]; + + $author = ['uid' => 0, 'id' => $row['author-id'], + 'network' => $row['author-network'], 'url' => $row['author-link']]; + $url = '' . htmlentities($row['author-name']) . ''; + + $actor = ['url' => $url, 'link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']]; $received = $row['received']; } @@ -758,11 +763,13 @@ 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']; - $comments[$line]['owner-name'] = $actor['name']; + if (!empty($actor)) { + $comments[$line]['reshared'] = DI::l10n()->t('%s reshared this.', $actor['url']); + if (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']; + } } } } diff --git a/src/Object/Post.php b/src/Object/Post.php index 788fdedde6..071652b5e4 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -419,12 +419,6 @@ class Post } } - if (!empty($item['reshared'])) { - $reshared = $item['reshared']; - } else { - $reshared = ''; - } - $tmp_item = [ 'template' => $this->getTemplate(), 'type' => implode("", array_slice(explode("/", $item['verb']), -1)), @@ -503,7 +497,7 @@ class Post 'uriid' => $item['uri-id'], 'return' => (DI::args()->getCommand()) ? bin2hex(DI::args()->getCommand()) : '', 'direction' => $direction, - 'reshared' => $reshared, + 'reshared' => $item['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/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index c2b4369593..202eb2b619 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -20,6 +20,9 @@
+ {{if $item.reshared}} +
{{$item.reshared nofilter}}
+ {{/if}}
{{if $item.owner_url}}
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index a4f980827a..317217b47d 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -82,7 +82,7 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
{{if $item.reshared}} -
{{$item.responses.announce.output nofilter}}
+
{{$item.reshared nofilter}}
{{/if}} {{* The avatar picture and the photo-menu *}}
From b248470376e8b0867b2161370c8f7d3f27b3dd1f Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 Sep 2020 05:35:04 +0000 Subject: [PATCH 3/4] Show "retweet" icon --- view/theme/frio/templates/sub/direction.tpl | 2 +- view/theme/frio/templates/wall_thread.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/templates/sub/direction.tpl b/view/theme/frio/templates/sub/direction.tpl index 4113c9beed..671272cd00 100644 --- a/view/theme/frio/templates/sub/direction.tpl +++ b/view/theme/frio/templates/sub/direction.tpl @@ -6,7 +6,7 @@ {{elseif $direction.direction == 2}} {{elseif $direction.direction == 3}} - + {{elseif $direction.direction == 4}} {{elseif $direction.direction == 5}} diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 317217b47d..38a6cce2b1 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -82,7 +82,7 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
{{if $item.reshared}} -
{{$item.reshared nofilter}}
+
{{$item.reshared nofilter}}
{{/if}} {{* The avatar picture and the photo-menu *}}
From 6c5af09589afcf922d3432ce71edbe6669034578 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 Sep 2020 14:37:58 +0000 Subject: [PATCH 4/4] Added link encoding --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 99f3d76b0b..1d374c5ca9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -730,7 +730,7 @@ function conversation_fetch_comments($thread_items, $pinned) { $author = ['uid' => 0, 'id' => $row['author-id'], 'network' => $row['author-network'], 'url' => $row['author-link']]; - $url = '' . htmlentities($row['author-name']) . ''; + $url = '' . htmlentities($row['author-name']) . ''; $actor = ['url' => $url, 'link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']]; $received = $row['received'];