From c2386bd3a18e91bfdfa3c2ceb78a6b553ce80b66 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:15:47 -0700
Subject: [PATCH] Remove a step when unfurling statuses with content warnings

---
 bookwyrm/templates/snippets/status/status_content.html | 2 +-
 bookwyrm/templates/snippets/trimmed_text.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 616e1e638..53ccc5ca7 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -35,7 +35,7 @@
         {% endif %}
 
         {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
-        {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
+        {% include 'snippets/trimmed_text.html' with full=status.content|safe no_trim=status.content_warning %}
         {% endif %}
         {% if status.attachments.exists %}
         <div class="block">
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index cac6e41b9..f91fe19b8 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -6,7 +6,7 @@
 {% with full|to_markdown|safe as full %}
 
 {% with full|to_markdown|safe|truncatewords_html:60 as trimmed %}
-{% if trimmed != full %}
+{% if not no_trim and trimmed != full %}
 <div id="hide-full-{{ uuid }}">
     <div class="content" id="trimmed-{{ uuid }}">
         <div dir="auto">{{ trimmed }}</div>