diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-02 21:21:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 21:21:44 +0100 |
| commit | d849aad85206bff2058fbbd9e187b0048c793cb9 (patch) | |
| tree | 490f65b5ed7987b7d8854ab2d57058358171a65c /app/views | |
| parent | 9136be480f9660dcdf0e5a17ed929e2eb5ee650c (diff) | |
Change public thread view to hide "Show thread" link (#15266)
Fixes #15262
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/statuses/_simple_status.html.haml | 5 | ||||
| -rw-r--r-- | app/views/statuses/_status.html.haml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 192192700..d60ade22f 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -1,3 +1,6 @@ +:ruby + hide_show_thread ||= false + .status{ class: "status-#{status.visibility}" } .status__info = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do @@ -47,7 +50,7 @@ - elsif status.preview_card = react_component :card, sensitive: sensitized?(status, current_account), 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json - - if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id + - if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id && !hide_show_thread = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__content__read-more-button', target: stream_link_target, rel: 'noopener noreferrer' do = t 'statuses.show_thread' diff --git a/app/views/statuses/_status.html.haml b/app/views/statuses/_status.html.haml index 650f9b679..13a06519c 100644 --- a/app/views/statuses/_status.html.haml +++ b/app/views/statuses/_status.html.haml @@ -39,7 +39,7 @@ %span = t('stream_entries.pinned') - = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, autoplay: autoplay + = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, autoplay: autoplay, hide_show_thread: is_predecessor || is_successor - if include_threads - if @since_descendant_thread_id |