Let user supply a note for report

bookwyrm/models/report.py

@@ -21,6 +21,7 @@ class Report(BookWyrmModel):
         constraints = [
             models.CheckConstraint(check=~Q(reporter=F("user")), name="self_report")
         ]
+        ordering = ("-created_date",)
 
 
 class ReportComment(BookWyrmModel):

bookwyrm/templates/moderation/report.html

@@ -32,11 +32,13 @@
     </forM=m>
 </div>
 
-<div class="block content">
-    <h3>{% trans "Reported statuses" %}</h3>
+<div class="block">
+    <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
     <ul>
-        {% for status in report.statuses.all %}
-        <li>{{ status.id }}</li>
+        {% for status in report.statuses.select_subclasses.all %}
+        <li>
+            {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
+        </li>
         {% endfor %}
     </ul>
 </div>

bookwyrm/templates/moderation/report_modal.html

@@ -0,0 +1,37 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+{% load humanize %}
+
+{% block modal-title %}
+{% blocktrans with username=user.username %}Report @{{ username }}{% endblocktrans %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form name="report" method="post" action="{% url 'report' %}">
+{% endblock %}
+
+{% block modal-body %}
+
+{% csrf_token %}
+<input type="hidden" name="reporter" value="{{ reporter.id }}">
+<input type="hidden" name="user" value="{{ user.id }}">
+<input type="hidden" name="statuses" value="{{ status.id }}">
+
+<section class="content">
+    <p>{% blocktrans with site_name=site.name %}This report will be sent to {{ site_name }}'s moderators for review.{% endblocktrans %}</p>
+    <label class="label" for="id_{{ controls_uid}}_report_note">{% trans "More info about this report:" %}</label>
+    <textarea class="textarea" name="note" id="id_{{ controls_uid }}_report_note"></textarea>
+</section>
+
+{% endblock %}
+
+
+{% block modal-footer %}
+
+<button class="button is-success" type="submit">{% trans "Submit" %}</button>
+{% trans "Cancel" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="report" controls_uid=report_uuid class="" %}
+
+{% endblock %}
+{% block modal-form-close %}</form>{% endblock %}
+

bookwyrm/templates/moderation/report_preview.html

@@ -9,7 +9,7 @@
 
 {% block card-content %}
 <div class="block">
-    {% if report.notes %}{{ report.notes }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+    {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
 </div>
 {% endblock %}
 

bookwyrm/templates/notifications.html

@@ -115,15 +115,7 @@
                     <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-white{% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %} has-text-black{% else %}-bis has-text-grey-dark{% endif %}{% endif %}">
                         <div class="columns">
                             <div class="column">
-                                {% if related_status.content %}
-                                <a href="{{ related_status.local_path }}">
-                                    {{ related_status.content | safe | truncatewords_html:10 }}{% if related_status.mention_books %} <em>{{ related_status.mention_books.first.title }}</em>{% endif %}
-                                </a>
-                                {% elif related_status.quote %}
-                                <a href="{{ related_status.local_path }}">{{ related_status.quote | safe | truncatewords_html:10 }}</a>
-                                {% elif related_status.rating %}
-                                {% include 'snippets/stars.html' with rating=related_status.rating %}
-                                {% endif %}
+                                {% include 'snippets/status_preview.html' with status=related_status %}
                             </div>
                             <div class="column is-narrow {% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %}has-text-black{% else %}has-text-grey-dark{% endif %}">
                                 {{ related_status.published_date | post_date }}

bookwyrm/templates/snippets/report_button.html

@@ -1,8 +1,10 @@
 {% load i18n %}
-<form name="report" method="post" action="{% url 'report' %}">
-    {% csrf_token %}
-    <input type="hidden" name="reporter" value="{{ request.user.id }}">
-    <input type="hidden" name="user" value="{{ user.id }}">
-    <input type="hidden" name="statuses" value="{{ user.id }}">
-    <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Report" %}</button>
-</form>
+{% load bookwyrm_tags %}
+{% with 0|uuid as report_uuid %}
+
+{% trans "Report" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with class="is-danger is-light is-small is-fullwidth" text=button_text controls_text="report" controls_uid=report_uuid focus="modal-title-report" disabled=is_current %}
+
+{% include 'moderation/report_modal.html' with user=user reporter=request.user controls_text="report" controls_uid=report_uuid %}
+
+{% endwith %}

bookwyrm/templates/snippets/status/status_body.html

@@ -18,7 +18,10 @@
 
 {% block card-footer %}
 <div class="card-footer-item">
-    {% if request.user.is_authenticated %}
+    {% if moderation_mode and perms.bookwyrm.moderate_post %}
+    {# moderation options #}
+    <button class="button is-danger is-light">{% trans "Delete status" %}</button>
+    {% elif request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
             {% trans "Reply" as button_text %}
@@ -56,14 +59,16 @@
 <div class="card-footer-item">
     <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
 </div>
+{% if not moderation_mode %}
 <div class="card-footer-item">
     {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
 </div>
+{% endif %}
 {% endblock %}
 
 
 {% block card-bonus %}
-{% if request.user.is_authenticated %}
+{% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}
 <section class="hidden" id="show-comment-{{ status.id }}">
     <div class="card-footer">

bookwyrm/templates/snippets/status/status_options.html

@@ -22,10 +22,10 @@
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem">
-    <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
+    <a href="/direct-messages/{{ status.user|username }}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
+    {% include 'snippets/report_button.html' with user=status.user status=status %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}

bookwyrm/templates/snippets/status_preview.html

@@ -0,0 +1,9 @@
+{% if status.content %}
+<a href="{{ status.local_path }}">
+    {{ status.content | safe | truncatewords_html:10 }}{% if status.mention_books %} <em>{{ status.mention_books.first.title }}</em>{% endif %}
+</a>
+{% elif status.quote %}
+<a href="{{ status.local_path }}">{{ status.quote | safe | truncatewords_html:10 }}</a>
+{% elif status.rating %}
+{% include 'snippets/stars.html' with rating=status.rating %}
+{% endif %}