From ad8666ebeca4367620c812dc73236a51102d85f3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 07:20:54 -0700
Subject: [PATCH] Removes extra "content" field in status editor that broke dms

---
 bookwyrm/templates/feed/direct_messages.html  |  2 +-
 .../snippets/create_status_form.html          | 20 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index f097fd9f..1e361e61 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -14,7 +14,7 @@
 </header>
 
 <div class="box">
-    {% include 'snippets/create_status_form.html' with type="direct" uuid=1 mentions=partner %}
+    {% include 'snippets/create_status_form.html' with type="direct" uuid=1 mention=partner %}
 </div>
 
 <section class="block">
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index a74230ad..f6021622 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -36,13 +36,23 @@
 
         <div class="control">
             {% if type == 'quotation' %}
-            <textarea name="quote" class="textarea" id="id_quote_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.quote|default:'' }}</textarea>
-            {% elif type == 'reply' %}
-            {% include 'snippets/content_warning_field.html' with parent_status=status %}
-            <textarea name="content" class="textarea" id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}" placeholder="{{ placeholder }}" aria-label="{% trans 'Reply' %}" required>{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mentions %}@{{ mentions|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
+            <textarea
+                name="quote"
+                class="textarea"
+                id="id_quote_{{ book.id }}_{{ type }}"
+                placeholder="{{ placeholder }}"
+                required
+            >{{ draft.quote|default:'' }}</textarea>
             {% else %}
             {% include 'snippets/content_warning_field.html' with parent_status=status %}
-            <textarea name="content" class="textarea" id="id_content_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.content|default:'' }}</textarea>
+            <textarea
+                name="content"
+                class="textarea"
+                id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}"
+                placeholder="{{ placeholder }}"
+                aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans "Content" %}{% endif %}"
+                required
+            >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
             {% endif %}
         </div>
     </div>