Updates report model

This commit is contained in:
Mouse Reeve
2022-02-24 12:48:52 -08:00
parent 3ce8b3390e
commit ad41f19dc5
11 changed files with 93 additions and 19 deletions

View File

@ -15,6 +15,7 @@
<div class="notification content">
<p>
{% trans "Auto-moderation rules will create reports for any user or status with fields matching the provided string." %}
{% trans "Users or statuses that have already been reported (regardless of whether the report was resolved) will not be flagged." %}
{% trans "At this time, reports are <em>not</em> being generated automatically, and you must manually trigger a scan." %}
</p>
<form name="run-scan" method="POST" action="{% url 'settings-automod-run' %}">

View File

@ -1,6 +1,7 @@
{% extends 'settings/layout.html' %}
{% load i18n %}
{% load humanize %}
{% load feed_page_tags %}
{% block title %}
{% include "settings/reports/report_header.html" with report=report %}
@ -30,20 +31,14 @@
</details>
</div>
{% if report.statuses.exists %}
{% if report.status %}
<div class="block">
<h3 class="title is-4">{% trans "Reported statuses" %}</h3>
<ul>
{% for status in report.statuses.select_subclasses.all %}
<li>
{% if status.deleted %}
<em>{% trans "Status has been deleted" %}</em>
{% else %}
{% include 'snippets/status/status.html' with status=status moderation_mode=True %}
{% endif %}
</li>
{% endfor %}
</ul>
<h3 class="title is-4">{% trans "Reported status" %}</h3>
{% if report.status.deleted %}
<em>{% trans "Status has been deleted" %}</em>
{% else %}
{% include 'snippets/status/status.html' with status=report.status|load_subclass moderation_mode=True %}
{% endif %}
</div>
{% endif %}

View File

@ -1,7 +1,7 @@
{% load i18n %}
{% load utilities %}
{% if report.statuses.exists %}
{% if report.status %}
{% blocktrans trimmed with report_id=report.id username=report.user|username %}
Report #{{ report_id }}: Status posted by @{{ username }}

View File

@ -12,6 +12,6 @@
>
{% trans "Report" %}
</button>
{% include 'snippets/report_modal.html' with user=user id=modal_id status=status.id %}
{% include 'snippets/report_modal.html' with user=user id=modal_id status_id=status.id %}
{% endwith %}

View File

@ -23,7 +23,7 @@
<input type="hidden" name="reporter" value="{{ request.user.id }}">
<input type="hidden" name="user" value="{{ user.id }}">
{% if status_id %}
<input type="hidden" name="statuses" value="{{ status_id }}">
<input type="hidden" name="status" value="{{ status_id }}">
{% endif %}
{% if link %}
<input type="hidden" name="links" value="{{ link.id }}">