Merge branch 'main' of https://github.com/mouse-reeve/bookwyrm into main

2021-03-04 20:49:31 +01:00
parent dab6592c12 74ab3505fe
commit 1a64f69587
31 changed files with 4376 additions and 545 deletions
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -34,7 +34,7 @@
        </div>
        {% endif %}

-        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
+        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
        {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
        {% endif %}
        {% if status.attachments.exists %}