Merge pull request #715 from mouse-reeve/reporting

Reporting

bookwyrm/templates/layout.html

@@ -114,8 +114,8 @@
                     {% endif %}
                     {% if perms.bookwyrm.edit_instance_settings %}
                     <li>
-                        <a href="{% url 'settings-site' %}" class="navbar-item">
-                            {% trans 'Site Configuration' %}
+                        <a href="{% url 'settings-reports' %}" class="navbar-item">
+                            {% trans 'Admin' %}
                         </a>
                     </li>
                     {% endif %}

bookwyrm/templates/moderation/report.html

@@ -0,0 +1,76 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+{% load humanize %}
+
+{% block title %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
+{% block header %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
+
+{% block panel %}
+<div class="block">
+    <a href="{% url 'settings-reports' %}">{% trans "Back to reports" %}</a>
+</div>
+
+<div class="block">
+    {% include 'moderation/report_preview.html' with report=report %}
+</div>
+
+<div class="block content">
+    <h3>{% trans "Actions" %}</h3>
+    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
+    <div class="is-flex">
+        <p class="mr-1">
+            <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
+        </p>
+        <form name="deactivate" method="post" action="{% url 'settings-report-deactivate' report.id  %}">
+            {% csrf_token %}
+            {% if report.user.is_active %}
+            <button type="submit" class="button is-danger is-light">{% trans "Deactivate user" %}</button>
+            {% else %}
+            <button class="button">{% trans "Reactivate user" %}</button>
+            {% endif %}
+        </form>
+    </div>
+</div>
+
+<div class="block">
+    <h3 class="title is-4">{% trans "Moderator Comments" %}</h3>
+    {% for comment in report.reportcomment_set.all %}
+    <div class="card block">
+        <p class="card-content">{{ comment.note }}</p>
+        <div class="card-footer">
+            <div class="card-footer-item">
+                <a href="{{ comment.user.local_path }}">{{ comment.user.display_name }}</a>
+            </div>
+            <div class="card-footer-item">
+                {{ comment.created_date | naturaltime }}
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+    <form class="block" name="report-comment" method="post" action="{% url 'settings-report' report.id %}">
+        {% csrf_token %}
+        <label for="report_comment" class="label">Comment on report</label>
+        <textarea name="note" id="report_comment" class="textarea"></textarea>
+        <button class="button">{% trans "Comment" %}</button>
+    </form>
+</div>
+
+<div class="block">
+    <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
+    {% if not report.statuses.exists %}
+    <em>{% trans "No statuses reported" %}</em>
+    {% else %}
+    <ul>
+        {% for status in report.statuses.select_subclasses.all %}
+        <li>
+            {% if status.deleted %}
+            <em>{% trans "Statuses has been deleted" %}</em>
+            {% else %}
+            {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
+            {% endif %}
+        </li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+</div>
+{% endblock %}

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

@@ -0,0 +1,37 @@
+{% extends 'components/card.html' %}
+{% load i18n %}
+{% load humanize %}
+{% block card-header %}
+<h2 class="card-header-title has-background-white-ter is-block">
+    <a href="{% url 'settings-report' report.id %}">{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}</a>
+</h2>
+{% endblock %}
+
+{% block card-content %}
+<div class="block content">
+    <p>
+        {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+    </p>
+</div>
+{% endblock %}
+
+{% block card-footer %}
+<div class="card-footer-item">
+    <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
+</div>
+<div class="card-footer-item">
+    {{ report.created_date | naturaltime }}
+</div>
+<div class="card-footer-item">
+    <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
+        {% csrf_token %}
+        <button class="button" type="submit">
+            {% if report.resolved %}
+            {% trans "Re-open" %}
+            {% else %}
+            {% trans "Resolve" %}
+            {% endif %}
+        </button>
+    </form>
+</div>
+{% endblock %}

bookwyrm/templates/moderation/reports.html

@@ -0,0 +1,28 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Reports" %}{% endblock %}
+{% block header %}{% trans "Reports" %}{% endblock %}
+
+{% block panel %}
+<div class="tabs">
+    <ul>
+        <li class="{% if not resolved %}is-active{% endif %}"{% if not resolved == 'open' %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?resolved=false">{% trans "Open" %}</a>
+        </li>
+        <li class="{% if resolved %}is-active{% endif %}"{% if resolved %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?resolved=true">{% trans "Resolved" %}</a>
+        </li>
+    </ul>
+</div>
+
+<div class="block">
+    {% for report in reports %}
+    <div class="block">
+        {% include 'moderation/report_preview.html' with report=report %}
+    </div>
+    {% endfor %}
+</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/settings/admin_layout.html

@@ -18,6 +18,10 @@
                 {% url 'settings-invites' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
+            <li>
+                {% url 'settings-reports' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Reports" %}</a>
+            </li>
             <li>
                 {% url 'settings-federation' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Servers" %}</a>
@@ -42,7 +46,7 @@
         </ul>
         {% endif %}
     </nav>
-    <div class="column content">
+    <div class="column">
         {% block panel %}{% endblock %}
     </div>
 </div>

bookwyrm/templates/snippets/report_button.html

@@ -0,0 +1,10 @@
+{% load i18n %}
+{% 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,17 @@
 
 {% block card-footer %}
 <div class="card-footer-item">
-    {% if request.user.is_authenticated %}
+    {% if moderation_mode and perms.bookwyrm.moderate_post %}
+
+    {# moderation options #}
+    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+        {% csrf_token %}
+        <button class="button is-danger is-light" type="submit">
+            {% trans "Delete status" %}
+        </button>
+    </form>
+
+    {% elif request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
             {% trans "Reply" as button_text %}
@@ -56,14 +66,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

@@ -10,6 +10,7 @@
 
 {% block dropdown-list %}
 {% if status.user == request.user %}
+{# things you can do to your own statuses #}
 <li role="menuitem">
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
@@ -19,8 +20,12 @@
     </form>
 </li>
 {% 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="{% url 'direct-messages-user' 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 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 %}

bookwyrm/templates/snippets/user_options.html

@@ -12,6 +12,9 @@
 <li role="menuitem">
     <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
+<li role="menuitem">
+    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
+</li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
 </li>