Converts report "comments" into broader "actions" table

This table will now track all actions taken on a report, like resolving
it, re-opening it, suspending the reported user, et cetera, in addition
to comments. When there are multiple admins, this change will make it
easier to understand what actions have been taken by whom on a report.

bookwyrm/views/admin/link_domains.py

@@ -7,6 +7,8 @@ from django.views import View
 from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
+from bookwyrm.models.report import APPROVE_DOMAIN, BLOCK_DOMAIN
+from bookwyrm.views.helpers import redirect_to_referer
 
 # pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
@@ -46,11 +48,17 @@ class LinkDomain(View):
 @require_POST
 @login_required
 @permission_required("bookwyrm.moderate_user")
-def update_domain_status(request, domain_id, status):
+def update_domain_status(request, domain_id, status, report_id=None):
     """This domain seems fine"""
     domain = get_object_or_404(models.LinkDomain, id=domain_id)
     domain.raise_not_editable(request.user)
 
     domain.status = status
     domain.save()
-    return redirect("settings-link-domain", status="pending")
+
+    if status == "approved":
+        models.Report.record_action(report_id, APPROVE_DOMAIN, request.user)
+    elif status == "blocked":
+        models.Report.record_action(report_id, BLOCK_DOMAIN, request.user)
+
+    return redirect_to_referer(request, "settings-link-domain", status="pending")

bookwyrm/views/admin/reports.py

@@ -8,6 +8,7 @@ from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import forms, models
+from bookwyrm.models.report import USER_SUSPENSION, USER_UNSUSPENSION, USER_DELETION
 from bookwyrm.views.helpers import redirect_to_referer
 from bookwyrm.settings import PAGE_LENGTH
 
@@ -81,41 +82,42 @@ class ReportAdmin(View):
     def post(self, request, report_id):
         """comment on a report"""
         report = get_object_or_404(models.Report, id=report_id)
-        models.ReportComment.objects.create(
-            user=request.user,
-            report=report,
-            note=request.POST.get("note"),
-        )
+        note = request.POST.get("note")
+        report.comment(request.user, note)
         return redirect("settings-report", report.id)
 
 
 @login_required
 @permission_required("bookwyrm.moderate_user")
-def suspend_user(request, user_id):
+def suspend_user(request, user_id, report_id=None):
     """mark an account as inactive"""
     user = get_object_or_404(models.User, id=user_id)
     user.is_active = False
     user.deactivation_reason = "moderator_suspension"
     # this isn't a full deletion, so we don't want to tell the world
     user.save(broadcast=False)
+
+    models.ReportAction.record_action(report_id, USER_SUSPENSION, request.user)
     return redirect_to_referer(request, "settings-user", user.id)
 
 
 @login_required
 @permission_required("bookwyrm.moderate_user")
-def unsuspend_user(request, user_id):
+def unsuspend_user(request, user_id, report_id=None):
     """mark an account as inactive"""
     user = get_object_or_404(models.User, id=user_id)
     user.is_active = True
     user.deactivation_reason = None
     # this isn't a full deletion, so we don't want to tell the world
     user.save(broadcast=False)
+
+    models.ReportAction.record_action(report_id, USER_UNSUSPENSION, request.user)
     return redirect_to_referer(request, "settings-user", user.id)
 
 
 @login_required
 @permission_required("bookwyrm.moderate_user")
-def moderator_delete_user(request, user_id):
+def moderator_delete_user(request, user_id, report_id=None):
     """permanently delete a user"""
     user = get_object_or_404(models.User, id=user_id)
 
@@ -130,6 +132,9 @@ def moderator_delete_user(request, user_id):
     if form.is_valid() and moderator.check_password(form.cleaned_data["password"]):
         user.deactivation_reason = "moderator_deletion"
         user.delete()
+
+        # make a note of the fact that we did this
+        models.ReportAction.record_action(report_id, USER_DELETION, request.user)
         return redirect_to_referer(request, "settings-user", user.id)
 
     form.errors["password"] = ["Invalid password"]
@@ -140,11 +145,12 @@ def moderator_delete_user(request, user_id):
 
 @login_required
 @permission_required("bookwyrm.moderate_post")
-def resolve_report(_, report_id):
+def resolve_report(request, report_id):
     """mark a report as (un)resolved"""
     report = get_object_or_404(models.Report, id=report_id)
-    report.resolved = not report.resolved
-    report.save()
-    if not report.resolved:
+    if report.resolved:
+        report.reopen(request.user)
         return redirect("settings-report", report.id)
+
+    report.resolve(request.user)
     return redirect("settings-reports")

bookwyrm/views/helpers.py

@@ -222,7 +222,7 @@ def maybe_redirect_local_path(request, model):
     return redirect(new_path, permanent=True)
 
 
-def redirect_to_referer(request, *args):
+def redirect_to_referer(request, *args, **kwargs):
     """Redirect to the referrer, if it's in our domain, with get params"""
     # make sure the refer is part of this instance
     validated = validate_url_domain(request.META.get("HTTP_REFERER"))
@@ -231,4 +231,4 @@ def redirect_to_referer(request, *args):
         return redirect(validated)
 
     # if not, use the args passed you'd normally pass to redirect()
-    return redirect(*args or "/")
+    return redirect(*args or "/", **kwargs)