From 5b229fa362dae4cd22495765b7e7c7e21f44fde8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Tue, 2 Jan 2024 13:57:19 -0800
Subject: [PATCH 01/18] Makes reports an activitypub model

---
 bookwyrm/activitypub/__init__.py              |  1 +
 bookwyrm/activitypub/verbs.py                 | 10 ++++
 .../migrations/0192_auto_20240102_2156.py     | 57 +++++++++++++++++++
 bookwyrm/models/report.py                     | 25 +++++---
 4 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 bookwyrm/migrations/0192_auto_20240102_2156.py

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index 41decd68af..5789986378 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -24,6 +24,7 @@
 from .verbs import Add, Remove
 from .verbs import Announce, Like
 from .verbs import Move
+from .verbs import Flag
 
 # this creates a list of all the Activity types that we can serialize,
 # so when an Activity comes in from outside, we can check if it's known
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index a365f4cc07..13a303af71 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -268,3 +268,13 @@ def action(self, allow_external_connections=True):
         else:
             # we might do something with this to move other objects at some point
             pass
+
+
+@dataclass(init=False)
+class Flag(Verb):
+    """Report a user to their home server"""
+
+    to: str
+    object: List[str] = None
+    links: List[str] = None
+    type: str = "Flag"
diff --git a/bookwyrm/migrations/0192_auto_20240102_2156.py b/bookwyrm/migrations/0192_auto_20240102_2156.py
new file mode 100644
index 0000000000..7537bbbaae
--- /dev/null
+++ b/bookwyrm/migrations/0192_auto_20240102_2156.py
@@ -0,0 +1,57 @@
+# Generated by Django 3.2.23 on 2024-01-02 21:56
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0191_merge_20240102_0326"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="report",
+            name="links",
+            field=bookwyrm.models.fields.ManyToManyField(
+                blank=True, to="bookwyrm.Link"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="note",
+            field=bookwyrm.models.fields.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="reporter",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="reporter",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="status",
+            field=bookwyrm.models.fields.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 74a9bbe411..153ba6dc29 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -3,8 +3,11 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from bookwyrm import activitypub
 from bookwyrm.settings import DOMAIN
+from .activitypub_mixin import ActivityMixin
 from .base_model import BookWyrmModel
+from . import fields
 
 
 # Report action enums
@@ -22,21 +25,29 @@
 DELETE_ITEM = "delete_item"
 
 
-class Report(BookWyrmModel):
+class Report(ActivityMixin, BookWyrmModel):
     """reported status or user"""
 
-    reporter = models.ForeignKey(
-        "User", related_name="reporter", on_delete=models.PROTECT
+    activity_serializer = activitypub.Flag
+
+    reporter = fields.ForeignKey(
+        "User",
+        related_name="reporter",
+        on_delete=models.PROTECT,
+        activitypub_field="actor",
+    )
+    note = fields.TextField(null=True, blank=True, activitypub_field="content")
+    user = fields.ForeignKey(
+        "User", on_delete=models.PROTECT, null=True, blank=True, activitypub_field="to"
     )
-    note = models.TextField(null=True, blank=True)
-    user = models.ForeignKey("User", on_delete=models.PROTECT, null=True, blank=True)
-    status = models.ForeignKey(
+    status = fields.ForeignKey(
         "Status",
         null=True,
         blank=True,
         on_delete=models.PROTECT,
+        activitypub_field="object",
     )
-    links = models.ManyToManyField("Link", blank=True)
+    links = fields.ManyToManyField("Link", blank=True)
     resolved = models.BooleanField(default=False)
 
     def raise_not_editable(self, viewer):

From 5c0ade5346726e39453c202b1c6cf7ea78969252 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Tue, 2 Jan 2024 14:38:35 -0800
Subject: [PATCH 02/18] Changes field names in report model so the reporter is
 "user"

This is such an annoying change but it is objectively better. Just gotta
be real sure they didn't get mixed up anywhere along the way.
---
 bookwyrm/emailing.py                          |  8 ++--
 bookwyrm/forms/forms.py                       |  2 +-
 .../0193_rename_user_report_reported_user.py  | 18 ++++++++
 .../0194_rename_reporter_report_user.py       | 18 ++++++++
 bookwyrm/models/antispam.py                   |  8 ++--
 bookwyrm/models/report.py                     | 23 ++++++----
 bookwyrm/templates/report.html                |  2 +-
 .../templates/settings/reports/report.html    | 20 ++++----
 .../settings/reports/report_header.html       |  8 ++--
 .../settings/reports/report_preview.html      |  2 +-
 bookwyrm/templates/snippets/report_modal.html |  8 ++--
 bookwyrm/tests/models/test_report_model.py    | 46 +++++++++++++++++++
 bookwyrm/tests/views/admin/test_reports.py    | 18 +++++---
 bookwyrm/tests/views/admin/test_user_admin.py |  2 +-
 bookwyrm/tests/views/test_notifications.py    |  4 +-
 bookwyrm/tests/views/test_report.py           | 10 ++--
 16 files changed, 145 insertions(+), 52 deletions(-)
 create mode 100644 bookwyrm/migrations/0193_rename_user_report_reported_user.py
 create mode 100644 bookwyrm/migrations/0194_rename_reporter_report_user.py
 create mode 100644 bookwyrm/tests/models/test_report_model.py

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 5e08ebba13..758da962c0 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -50,9 +50,11 @@ def password_reset_email(reset_code):
 def moderation_report_email(report):
     """a report was created"""
     data = email_data()
-    data["reporter"] = report.reporter.localname or report.reporter.username
-    if report.user:
-        data["reportee"] = report.user.localname or report.user.username
+    data["reporter"] = report.user.localname or report.user.username
+    if report.reported_user:
+        data["reportee"] = (
+            report.reported_user.localname or report.reported_user.username
+        )
     data["report_link"] = report.remote_id
     data["link_domain"] = report.links.exists()
 
diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py
index 3d555f308d..4764b871a7 100644
--- a/bookwyrm/forms/forms.py
+++ b/bookwyrm/forms/forms.py
@@ -44,7 +44,7 @@ class Meta:
 class ReportForm(CustomForm):
     class Meta:
         model = models.Report
-        fields = ["user", "reporter", "status", "links", "note"]
+        fields = ["reported_user", "user", "status", "links", "note"]
 
 
 class ReadThroughForm(CustomForm):
diff --git a/bookwyrm/migrations/0193_rename_user_report_reported_user.py b/bookwyrm/migrations/0193_rename_user_report_reported_user.py
new file mode 100644
index 0000000000..0633e69fa1
--- /dev/null
+++ b/bookwyrm/migrations/0193_rename_user_report_reported_user.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.23 on 2024-01-02 22:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0192_auto_20240102_2156"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="report",
+            old_name="user",
+            new_name="reported_user",
+        ),
+    ]
diff --git a/bookwyrm/migrations/0194_rename_reporter_report_user.py b/bookwyrm/migrations/0194_rename_reporter_report_user.py
new file mode 100644
index 0000000000..3c2c0f1802
--- /dev/null
+++ b/bookwyrm/migrations/0194_rename_reporter_report_user.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.23 on 2024-01-02 22:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0193_rename_user_report_reported_user"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="report",
+            old_name="reporter",
+            new_name="user",
+        ),
+    ]
diff --git a/bookwyrm/models/antispam.py b/bookwyrm/models/antispam.py
index 1067cbf1d7..da58e8aa68 100644
--- a/bookwyrm/models/antispam.py
+++ b/bookwyrm/models/antispam.py
@@ -109,9 +109,9 @@ def automod_users(reporter):
     return report_model.objects.bulk_create(
         [
             report_model(
-                reporter=reporter,
+                user=reporter,
                 note=_("Automatically generated report"),
-                user=u,
+                reported_user=u,
             )
             for u in users
         ]
@@ -143,9 +143,9 @@ def automod_statuses(reporter):
     return report_model.objects.bulk_create(
         [
             report_model(
-                reporter=reporter,
+                user=reporter,
                 note=_("Automatically generated report"),
-                user=s.user,
+                reported_user=s.user,
                 status=s,
             )
             for s in statuses
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 153ba6dc29..9a9b0393c5 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -1,5 +1,4 @@
 """ flagged for moderation """
-from django.core.exceptions import PermissionDenied
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
@@ -30,15 +29,19 @@ class Report(ActivityMixin, BookWyrmModel):
 
     activity_serializer = activitypub.Flag
 
-    reporter = fields.ForeignKey(
+    user = fields.ForeignKey(
         "User",
-        related_name="reporter",
         on_delete=models.PROTECT,
         activitypub_field="actor",
     )
     note = fields.TextField(null=True, blank=True, activitypub_field="content")
-    user = fields.ForeignKey(
-        "User", on_delete=models.PROTECT, null=True, blank=True, activitypub_field="to"
+    reported_user = fields.ForeignKey(
+        "User",
+        related_name="reported_user",
+        on_delete=models.PROTECT,
+        null=True,
+        blank=True,
+        activitypub_field="to",
     )
     status = fields.ForeignKey(
         "Status",
@@ -50,11 +53,11 @@ class Report(ActivityMixin, BookWyrmModel):
     links = fields.ManyToManyField("Link", blank=True)
     resolved = models.BooleanField(default=False)
 
-    def raise_not_editable(self, viewer):
-        """instead of user being the owner field, it's reporter"""
-        if self.reporter == viewer or viewer.has_perm("bookwyrm.moderate_user"):
-            return
-        raise PermissionDenied()
+    def get_recipients(self, software=None):
+        """Send this to the public inbox of the offending instance"""
+        if self.user.local:
+            return None
+        return [self.user.shared_inbox or self.user.inbox]
 
     def get_remote_id(self):
         return f"https://{DOMAIN}/settings/reports/{self.id}"
diff --git a/bookwyrm/templates/report.html b/bookwyrm/templates/report.html
index be7ed68f7a..b1ea826925 100644
--- a/bookwyrm/templates/report.html
+++ b/bookwyrm/templates/report.html
@@ -6,5 +6,5 @@
 {% endblock %}
 
 {% block content %}
-{% include "snippets/report_modal.html" with user=user active=True static=True id="report-modal" %}
+{% include "snippets/report_modal.html" with reported_user=reported_user active=True static=True id="report-modal" %}
 {% endblock %}
diff --git a/bookwyrm/templates/settings/reports/report.html b/bookwyrm/templates/settings/reports/report.html
index df45341c6d..f26892af51 100644
--- a/bookwyrm/templates/settings/reports/report.html
+++ b/bookwyrm/templates/settings/reports/report.html
@@ -27,7 +27,7 @@
         </summary>
         <div class="box">
             {% trans "Update on your report:" as dm_template %}
-            {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=report.reporter prepared_content=dm_template no_script=True %}
+            {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=report.user prepared_content=dm_template no_script=True %}
         </div>
     </details>
 </div>
@@ -56,10 +56,10 @@ <h3 class="title is-4">{% trans "Reported links" %}</h3>
 </div>
 {% endif %}
 
-{% if report.user %}
-{% include 'settings/users/user_info.html' with user=report.user %}
+{% if report.reported_user %}
+{% include 'settings/users/user_info.html' with reported_user=report.reported_user %}
 
-{% include 'settings/users/user_moderation_actions.html' with user=report.user %}
+{% include 'settings/users/user_moderation_actions.html' with reported_user=report.reported_user %}
 {% endif %}
 
 <div class="block content">
@@ -70,8 +70,8 @@ <h3 class="title is-4">{% trans "Moderation Activity" %}</h3>
             <li class="mb-2">
                 <div class="is-flex">
                     <p class="mb-0 is-flex-grow-1">
-                        {% blocktrans trimmed with user=report.reporter|username user_link=report.reporter.local_path %}
-                        <a href="{{ user_link }}">{{ user}}</a> opened this report
+                        {% blocktrans trimmed with reported_user=report.user|username user_link=report.user.local_path %}
+                        <a href="{{ user_link }}">{{ reported_user}}</a> opened this report
                         {% endblocktrans %}
                     </p>
                     <span class="tag">{{ report.created_date }}</span>
@@ -83,12 +83,12 @@ <h3 class="title is-4">{% trans "Moderation Activity" %}</h3>
                 <div class="is-flex">
                     <p class="mb-0 is-flex-grow-1">
                         {% if comment.action_type == "comment" %}
-                            {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %}
-                            <a href="{{ user_link }}">{{ user}}</a> commented on this report:
+                            {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %}
+                            <a href="{{ user_link }}">{{ reported_user}}</a> commented on this report:
                             {% endblocktrans %}
                         {% else %}
-                            {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %}
-                            <a href="{{ user_link }}">{{ user}}</a> took an action on this report:
+                            {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %}
+                            <a href="{{ user_link }}">{{ reported_user}}</a> took an action on this report:
                             {% endblocktrans %}
                             <span class="has-text-weight-bold">
                                 {{ comment.get_action_type_display }}
diff --git a/bookwyrm/templates/settings/reports/report_header.html b/bookwyrm/templates/settings/reports/report_header.html
index b77c6c6ae6..1c9b01c9b2 100644
--- a/bookwyrm/templates/settings/reports/report_header.html
+++ b/bookwyrm/templates/settings/reports/report_header.html
@@ -3,14 +3,14 @@
 
 {% if report.status %}
 
-{% blocktrans trimmed with report_id=report.id username=report.user|username %}
+{% blocktrans trimmed with report_id=report.id username=report.reported_user|username %}
 Report #{{ report_id }}: Status posted by @{{ username }}
 {% endblocktrans %}
 
 {% elif report.links.exists %}
 
-    {% if report.user %}
-    {% blocktrans trimmed with report_id=report.id username=report.user|username %}
+    {% if report.reported_user %}
+    {% blocktrans trimmed with report_id=report.id username=report.reported_user|username %}
     Report #{{ report_id }}: Link added by @{{ username }}
     {% endblocktrans %}
     {% else %}
@@ -21,7 +21,7 @@
 
 {% else %}
 
-{% blocktrans trimmed with report_id=report.id username=report.user|username %}
+{% blocktrans trimmed with report_id=report.id username=report.reported_user|username %}
 Report #{{ report_id }}: User @{{ username }}
 {% endblocktrans %}
 
diff --git a/bookwyrm/templates/settings/reports/report_preview.html b/bookwyrm/templates/settings/reports/report_preview.html
index bd0009c519..26afd273cf 100644
--- a/bookwyrm/templates/settings/reports/report_preview.html
+++ b/bookwyrm/templates/settings/reports/report_preview.html
@@ -21,7 +21,7 @@ <h2 class="card-header-title has-background-secondary is-block">
 
 {% block card-footer %}
 <div class="card-footer-item">
-    <p>{% blocktrans with username=report.reporter|username path=report.reporter.local_path %}Reported by <a href="{{ path }}">@{{ username }}</a>{% endblocktrans %}</p>
+    <p>{% blocktrans with username=report.user|username path=report.user.local_path %}Reported by <a href="{{ path }}">@{{ username }}</a>{% endblocktrans %}</p>
 </div>
 <div class="card-footer-item">
     {{ report.created_date | naturaltime }}
diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html
index e80dd1f5ea..8e4315c538 100644
--- a/bookwyrm/templates/snippets/report_modal.html
+++ b/bookwyrm/templates/snippets/report_modal.html
@@ -5,11 +5,11 @@
 
 {% block modal-title %}
 {% if status %}
-{% blocktrans with username=user|username %}Report @{{ username }}'s status{% endblocktrans %}
+{% blocktrans with username=reported_user|username %}Report @{{ username }}'s status{% endblocktrans %}
 {% elif link %}
 {% blocktrans with domain=link.domain.domain %}Report {{ domain }} link{% endblocktrans %}
 {% else %}
-{% blocktrans with username=user|username %}Report @{{ username }}{% endblocktrans %}
+{% blocktrans with username=reported_user|username %}Report @{{ username }}{% endblocktrans %}
 {%  endif %}
 {% endblock %}
 
@@ -20,8 +20,8 @@
 {% block modal-body %}
 
 {% csrf_token %}
-<input type="hidden" name="reporter" value="{{ request.user.id }}">
-<input type="hidden" name="user" value="{{ user.id }}">
+<input type="hidden" name="user" value="{{ request.reported_user.id }}">
+<input type="hidden" name="reported_user" value="{{ reported_user.id }}">
 {% if status_id %}
 <input type="hidden" name="status" value="{{ status_id }}">
 {% endif %}
diff --git a/bookwyrm/tests/models/test_report_model.py b/bookwyrm/tests/models/test_report_model.py
new file mode 100644
index 0000000000..2a77a7c639
--- /dev/null
+++ b/bookwyrm/tests/models/test_report_model.py
@@ -0,0 +1,46 @@
+""" testing models """
+from unittest.mock import patch
+from django.test import TestCase
+
+from bookwyrm import models
+
+
+class Relationship(TestCase):
+    """following, blocking, stuff like that"""
+
+    @classmethod
+    def setUpTestData(self):  # pylint: disable=bad-classmethod-argument, invalid-name
+        """we need some users for this"""
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ), patch("bookwyrm.lists_stream.populate_lists_task.delay"):
+            self.local_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
+            )
+            self.another_local_user = models.User.objects.create_user(
+                "bird", "bird@bird.com", "birdword", local=True, localname="bird"
+            )
+        self.local_user.remote_id = "http://local.com/user/mouse"
+        self.local_user.save(broadcast=False, update_fields=["remote_id"])
+
+    def test_report_local_user(self):
+        """a report/flag within an instance"""
+        report = models.Report.objects.create(
+            user=self.local_user,
+            note="oh no bad",
+            reported_user=self.another_local_user,
+        )
+        activity = report.to_activity()
+        self.assertEqual(activity.type, "Flag")
+        self.assertEqual(activity.actor, self.local_user)
+        self.assertEqual(activity.to, self.another_local_user.remote_id)
diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py
index 4334eeed96..3b72a64d6c 100644
--- a/bookwyrm/tests/views/admin/test_reports.py
+++ b/bookwyrm/tests/views/admin/test_reports.py
@@ -61,7 +61,7 @@ def test_reports_page_with_data(self):
         view = views.ReportsAdmin.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        models.Report.objects.create(user=self.local_user, reported_user=self.rat)
 
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
@@ -73,7 +73,9 @@ def test_report_page(self):
         view = views.ReportAdmin.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        report = models.Report.objects.create(
+            user=self.local_user, reported_user=self.rat
+        )
 
         result = view(request, report.id)
 
@@ -86,7 +88,9 @@ def test_report_action(self):
         view = views.ReportAdmin.as_view()
         request = self.factory.post("", {"note": "hi"})
         request.user = self.local_user
-        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        report = models.Report.objects.create(
+            user=self.local_user, reported_user=self.rat
+        )
 
         view(request, report.id)
 
@@ -98,7 +102,9 @@ def test_report_action(self):
 
     def test_resolve_report(self):
         """toggle report resolution status"""
-        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        report = models.Report.objects.create(
+            user=self.local_user, reported_user=self.rat
+        )
         self.assertFalse(report.resolved)
         self.assertFalse(models.ReportAction.objects.exists())
         request = self.factory.post("")
@@ -112,7 +118,7 @@ def test_resolve_report(self):
         # check that the action was noted
         self.assertTrue(
             models.ReportAction.objects.filter(
-                report=report, action_type="resolve", user=self.local_user
+                report=report, action_type="resolve", reported_user=self.local_user
             ).exists()
         )
 
@@ -124,7 +130,7 @@ def test_resolve_report(self):
         # check that the action was noted
         self.assertTrue(
             models.ReportAction.objects.filter(
-                report=report, action_type="reopen", user=self.local_user
+                report=report, action_type="reopen", reported_user=self.local_user
             ).exists()
         )
 
diff --git a/bookwyrm/tests/views/admin/test_user_admin.py b/bookwyrm/tests/views/admin/test_user_admin.py
index 99c6305269..379b0bc4a2 100644
--- a/bookwyrm/tests/views/admin/test_user_admin.py
+++ b/bookwyrm/tests/views/admin/test_user_admin.py
@@ -96,7 +96,7 @@ def test_user_admin_page_post_with_report(self, *_):
         )
 
         report = models.Report.objects.create(
-            user=self.local_user, reporter=self.local_user
+            reported_user=self.local_user, user=self.local_user
         )
 
         view = views.UserAdmin.as_view()
diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py
index 8d239d77a2..6df7394675 100644
--- a/bookwyrm/tests/views/test_notifications.py
+++ b/bookwyrm/tests/views/test_notifications.py
@@ -115,8 +115,8 @@ def test_notifications_page_follows(self):
     def test_notifications_page_report(self):
         """import completed notification"""
         report = models.Report.objects.create(
-            user=self.another_user,
-            reporter=self.local_user,
+            reported_user=self.another_user,
+            user=self.local_user,
         )
         notification = models.Notification.objects.create(
             user=self.local_user,
diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py
index 3e4c64f684..6d92b11a08 100644
--- a/bookwyrm/tests/views/test_report.py
+++ b/bookwyrm/tests/views/test_report.py
@@ -77,15 +77,15 @@ def test_report_modal_view_with_link_domain(self):
     def test_make_report(self):
         """a user reports another user"""
         form = forms.ReportForm()
-        form.data["reporter"] = self.local_user.id
-        form.data["user"] = self.rat.id
+        form.data["user"] = self.local_user.id
+        form.data["reported_user"] = self.rat.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
         views.Report.as_view()(request)
 
         report = models.Report.objects.get()
-        self.assertEqual(report.reporter, self.local_user)
+        self.assertEqual(report.user, self.local_user)
         self.assertEqual(report.user, self.rat)
 
     def test_report_link(self):
@@ -99,8 +99,8 @@ def test_report_link(self):
         domain.save()
 
         form = forms.ReportForm()
-        form.data["reporter"] = self.local_user.id
-        form.data["user"] = self.rat.id
+        form.data["user"] = self.local_user.id
+        form.data["reported_user"] = self.rat.id
         form.data["links"] = link.id
         request = self.factory.post("", form.data)
         request.user = self.local_user

From 052823e0c94f2c1d4ee58f66dacba3b48a1ecf36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Tue, 2 Jan 2024 15:13:56 -0800
Subject: [PATCH 03/18] Allow the user to decide if they want to send along a
 report

---
 .../migrations/0195_auto_20240102_2310.py     | 39 +++++++++++++++++++
 bookwyrm/models/report.py                     |  9 +++++
 .../templates/snippets/report_button.html     |  2 +-
 bookwyrm/templates/snippets/report_modal.html |  2 +-
 bookwyrm/tests/models/test_report_model.py    |  7 ++--
 5 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 bookwyrm/migrations/0195_auto_20240102_2310.py

diff --git a/bookwyrm/migrations/0195_auto_20240102_2310.py b/bookwyrm/migrations/0195_auto_20240102_2310.py
new file mode 100644
index 0000000000..c6af5ae780
--- /dev/null
+++ b/bookwyrm/migrations/0195_auto_20240102_2310.py
@@ -0,0 +1,39 @@
+# Generated by Django 3.2.23 on 2024-01-02 23:10
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0194_rename_reporter_report_user"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="report",
+            name="allow_broadcast",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="reported_user",
+            field=bookwyrm.models.fields.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="reported_user",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 9a9b0393c5..a8a4357814 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -52,6 +52,15 @@ class Report(ActivityMixin, BookWyrmModel):
     )
     links = fields.ManyToManyField("Link", blank=True)
     resolved = models.BooleanField(default=False)
+    allow_broadcast = models.BooleanField(default=False)
+
+    def broadcast(self, activity, sender, *args, **kwargs):
+        """only need to send an activity for remote offenders"""
+        # don't try to broadcast if the reporter doesn't want you to,
+        # or if the reported user is local
+        if self.reported_user.local or not self.allow_broadcast:
+            return
+        super().broadcast(activity, sender, *args, **kwargs)
 
     def get_recipients(self, software=None):
         """Send this to the public inbox of the offending instance"""
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 92d70699ca..ce795f5bec 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -12,6 +12,6 @@
 >
     {% trans "Report" %}
 </button>
-{% include 'snippets/report_modal.html' with user=user id=modal_id status_id=status.id %}
+{% include 'snippets/report_modal.html' with reported_user=user id=modal_id status_id=status.id %}
 
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html
index 8e4315c538..c5d3987f53 100644
--- a/bookwyrm/templates/snippets/report_modal.html
+++ b/bookwyrm/templates/snippets/report_modal.html
@@ -20,7 +20,7 @@
 {% block modal-body %}
 
 {% csrf_token %}
-<input type="hidden" name="user" value="{{ request.reported_user.id }}">
+<input type="hidden" name="user" value="{{ request.user.id }}">
 <input type="hidden" name="reported_user" value="{{ reported_user.id }}">
 {% if status_id %}
 <input type="hidden" name="status" value="{{ status_id }}">
diff --git a/bookwyrm/tests/models/test_report_model.py b/bookwyrm/tests/models/test_report_model.py
index 2a77a7c639..cb6942a276 100644
--- a/bookwyrm/tests/models/test_report_model.py
+++ b/bookwyrm/tests/models/test_report_model.py
@@ -40,7 +40,8 @@ def test_report_local_user(self):
             note="oh no bad",
             reported_user=self.another_local_user,
         )
+
         activity = report.to_activity()
-        self.assertEqual(activity.type, "Flag")
-        self.assertEqual(activity.actor, self.local_user)
-        self.assertEqual(activity.to, self.another_local_user.remote_id)
+        self.assertEqual(activity["type"], "Flag")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["to"], self.another_local_user.remote_id)

From d4013b97212b51d6b9a3728d631b6aa84f28fd43 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Tue, 2 Jan 2024 18:54:16 -0800
Subject: [PATCH 04/18] Fixes some user/reported_user references

---
 bookwyrm/templates/settings/reports/report.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/settings/reports/report.html b/bookwyrm/templates/settings/reports/report.html
index f26892af51..e0c86af6ca 100644
--- a/bookwyrm/templates/settings/reports/report.html
+++ b/bookwyrm/templates/settings/reports/report.html
@@ -57,9 +57,9 @@ <h3 class="title is-4">{% trans "Reported links" %}</h3>
 {% endif %}
 
 {% if report.reported_user %}
-{% include 'settings/users/user_info.html' with reported_user=report.reported_user %}
+{% include 'settings/users/user_info.html' with user=report.reported_user %}
 
-{% include 'settings/users/user_moderation_actions.html' with reported_user=report.reported_user %}
+{% include 'settings/users/user_moderation_actions.html' with user=report.reported_user %}
 {% endif %}
 
 <div class="block content">
@@ -70,8 +70,8 @@ <h3 class="title is-4">{% trans "Moderation Activity" %}</h3>
             <li class="mb-2">
                 <div class="is-flex">
                     <p class="mb-0 is-flex-grow-1">
-                        {% blocktrans trimmed with reported_user=report.user|username user_link=report.user.local_path %}
-                        <a href="{{ user_link }}">{{ reported_user}}</a> opened this report
+                        {% blocktrans trimmed with user=report.user|username user_link=report.user.local_path %}
+                        <a href="{{ user_link }}">{{ user }}</a> opened this report
                         {% endblocktrans %}
                     </p>
                     <span class="tag">{{ report.created_date }}</span>
@@ -83,12 +83,12 @@ <h3 class="title is-4">{% trans "Moderation Activity" %}</h3>
                 <div class="is-flex">
                     <p class="mb-0 is-flex-grow-1">
                         {% if comment.action_type == "comment" %}
-                            {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %}
-                            <a href="{{ user_link }}">{{ reported_user}}</a> commented on this report:
+                            {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %}
+                            <a href="{{ user_link }}">{{ user}}</a> commented on this report:
                             {% endblocktrans %}
                         {% else %}
-                            {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %}
-                            <a href="{{ user_link }}">{{ reported_user}}</a> took an action on this report:
+                            {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %}
+                            <a href="{{ user_link }}">{{ user}}</a> took an action on this report:
                             {% endblocktrans %}
                             <span class="has-text-weight-bold">
                                 {{ comment.get_action_type_display }}

From 0612930fb95b242183a73f52b667b44673797f81 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Tue, 2 Jan 2024 19:14:40 -0800
Subject: [PATCH 05/18] UI for deciding to send reports to remote

Shows a checkbox for the user and lets the admin know
---
 bookwyrm/forms/forms.py                                 | 2 +-
 bookwyrm/templates/settings/reports/report_preview.html | 9 +++++++++
 bookwyrm/templates/snippets/report_modal.html           | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py
index 4764b871a7..96d8142a58 100644
--- a/bookwyrm/forms/forms.py
+++ b/bookwyrm/forms/forms.py
@@ -44,7 +44,7 @@ class Meta:
 class ReportForm(CustomForm):
     class Meta:
         model = models.Report
-        fields = ["reported_user", "user", "status", "links", "note"]
+        fields = ["reported_user", "user", "status", "links", "note", "allow_broadcast"]
 
 
 class ReadThroughForm(CustomForm):
diff --git a/bookwyrm/templates/settings/reports/report_preview.html b/bookwyrm/templates/settings/reports/report_preview.html
index 26afd273cf..85eb2a1004 100644
--- a/bookwyrm/templates/settings/reports/report_preview.html
+++ b/bookwyrm/templates/settings/reports/report_preview.html
@@ -23,6 +23,15 @@ <h2 class="card-header-title has-background-secondary is-block">
 <div class="card-footer-item">
     <p>{% blocktrans with username=report.user|username path=report.user.local_path %}Reported by <a href="{{ path }}">@{{ username }}</a>{% endblocktrans %}</p>
 </div>
+{% if not report.reported_user.local %}
+<div class="card-footer-item">
+    {% if report.allow_broadcast %}
+    <p>{% trans "Sent to remote instance" %}</p>
+    {% else %}
+    <p>{% trans "<b>Not</b> sent to remote instance" %}</p>
+    {% endif %}
+</div>
+{% endif %}
 <div class="card-footer-item">
     {{ report.created_date | naturaltime }}
 </div>
diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html
index c5d3987f53..67a2d8cc6f 100644
--- a/bookwyrm/templates/snippets/report_modal.html
+++ b/bookwyrm/templates/snippets/report_modal.html
@@ -36,6 +36,15 @@
             {% trans "Links from this domain will be removed until your report has been reviewed." %}
         {% endif %}
     </p>
+    {% if not reported_user.local %}
+    <label class="checkbox label">
+        <input class="checkbox" id="id_allow_broadcast" type="checkbox" name="allow_broadcast" checked>
+        {% trans "Also send this report to the user's instance admins" %}
+    </label>
+    {% else %}
+        <input type="hidden" name="allow_broadcast">
+    {% endif %}
+    </p>
     <div class="control">
         <label class="label" for="id_{{ controls_uid }}_report_note">
             {% trans "More info about this report:" %}

From 8de3668065f2ca2881fcb5b5b0abe15d983dc6f9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Tue, 2 Jan 2024 19:24:27 -0800
Subject: [PATCH 06/18] Expands tests and fixes logic error in report
 recipients

---
 bookwyrm/models/report.py                     |  6 +++---
 bookwyrm/templates/snippets/report_modal.html |  1 -
 bookwyrm/tests/models/test_report_model.py    | 14 ++++++++++++++
 bookwyrm/tests/views/admin/test_reports.py    |  4 ++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index a8a4357814..988b65f4fc 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -64,9 +64,9 @@ def broadcast(self, activity, sender, *args, **kwargs):
 
     def get_recipients(self, software=None):
         """Send this to the public inbox of the offending instance"""
-        if self.user.local:
-            return None
-        return [self.user.shared_inbox or self.user.inbox]
+        if self.reported_user.local:
+            return []
+        return [self.reported_user.shared_inbox or self.reported_user.inbox]
 
     def get_remote_id(self):
         return f"https://{DOMAIN}/settings/reports/{self.id}"
diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html
index 67a2d8cc6f..b0e5925f6a 100644
--- a/bookwyrm/templates/snippets/report_modal.html
+++ b/bookwyrm/templates/snippets/report_modal.html
@@ -44,7 +44,6 @@
     {% else %}
         <input type="hidden" name="allow_broadcast">
     {% endif %}
-    </p>
     <div class="control">
         <label class="label" for="id_{{ controls_uid }}_report_note">
             {% trans "More info about this report:" %}
diff --git a/bookwyrm/tests/models/test_report_model.py b/bookwyrm/tests/models/test_report_model.py
index cb6942a276..95485862e6 100644
--- a/bookwyrm/tests/models/test_report_model.py
+++ b/bookwyrm/tests/models/test_report_model.py
@@ -45,3 +45,17 @@ def test_report_local_user(self):
         self.assertEqual(activity["type"], "Flag")
         self.assertEqual(activity["actor"], self.local_user.remote_id)
         self.assertEqual(activity["to"], self.another_local_user.remote_id)
+        # self.assertEqual(activity["object"], [self.another_local_user.remote_id])
+        self.assertEqual(report.get_recipients(), [])
+
+    def test_report_remote_user_with_broadcast(self):
+        """a report to the outside needs to broadcast"""
+        with patch("bookwyrm.models.report.Report.broadcast") as broadcast_mock:
+            report = models.Report.objects.create(
+                user=self.local_user,
+                note="oh no bad",
+                reported_user=self.remote_user,
+                allow_broadcast=True,
+            )
+        self.assertEqual(broadcast_mock.call_count, 1)
+        self.assertEqual(report.get_recipients(), [self.remote_user.inbox])
diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py
index 3b72a64d6c..7e1b4125e9 100644
--- a/bookwyrm/tests/views/admin/test_reports.py
+++ b/bookwyrm/tests/views/admin/test_reports.py
@@ -118,7 +118,7 @@ def test_resolve_report(self):
         # check that the action was noted
         self.assertTrue(
             models.ReportAction.objects.filter(
-                report=report, action_type="resolve", reported_user=self.local_user
+                report=report, action_type="resolve", user=self.local_user
             ).exists()
         )
 
@@ -130,7 +130,7 @@ def test_resolve_report(self):
         # check that the action was noted
         self.assertTrue(
             models.ReportAction.objects.filter(
-                report=report, action_type="reopen", reported_user=self.local_user
+                report=report, action_type="reopen", user=self.local_user
             ).exists()
         )
 

From a7669aa51c4ad272360e6e0a9bd1985d9a372a97 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Wed, 3 Apr 2024 10:44:26 -0700
Subject: [PATCH 07/18] Adds merge migration

---
 bookwyrm/migrations/0200_merge_20240403_1728.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0200_merge_20240403_1728.py

diff --git a/bookwyrm/migrations/0200_merge_20240403_1728.py b/bookwyrm/migrations/0200_merge_20240403_1728.py
new file mode 100644
index 0000000000..e39991ea22
--- /dev/null
+++ b/bookwyrm/migrations/0200_merge_20240403_1728.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.25 on 2024-04-03 17:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0195_auto_20240102_2310"),
+        ("bookwyrm", "0199_status_bookwyrm_st_remote__06aeba_idx"),
+    ]
+
+    operations = []

From 8fdcd4b6b1aa1d79ff03b6360a48c5458220788d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Wed, 3 Apr 2024 10:50:02 -0700
Subject: [PATCH 08/18] Fixes error in report tests

---
 bookwyrm/tests/views/test_report.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py
index 9339c37469..8512378a2f 100644
--- a/bookwyrm/tests/views/test_report.py
+++ b/bookwyrm/tests/views/test_report.py
@@ -8,6 +8,7 @@
 from bookwyrm.tests.validate_html import validate_html
 
 
+# pylint: disable=invalid-name
 class ReportViews(TestCase):
     """every response to a get request, html or json"""
 
@@ -51,12 +52,12 @@ def test_report_modal_view(self):
         """a user reports another user"""
         request = self.factory.get("")
         request.user = self.local_user
-        result = views.Report.as_view()(request, self.local_user.id)
+        result = views.Report.as_view()(request, user_id=self.local_user.id)
 
         validate_html(result.render())
 
     def test_report_modal_view_with_status(self):
-        """a user reports another user"""
+        """a user reports another user status"""
         request = self.factory.get("")
         request.user = self.local_user
         result = views.Report.as_view()(
@@ -66,7 +67,7 @@ def test_report_modal_view_with_status(self):
         validate_html(result.render())
 
     def test_report_modal_view_with_link_domain(self):
-        """a user reports another user"""
+        """a user reports a link"""
         link = models.Link.objects.create(
             url="http://example.com/hi",
             added_by=self.local_user,
@@ -78,7 +79,7 @@ def test_report_modal_view_with_link_domain(self):
         validate_html(result.render())
 
     def test_make_report(self):
-        """a user reports another user"""
+        """a local user reports a remote user"""
         form = forms.ReportForm()
         form.data["user"] = self.local_user.id
         form.data["reported_user"] = self.rat.id
@@ -89,7 +90,7 @@ def test_make_report(self):
 
         report = models.Report.objects.get()
         self.assertEqual(report.user, self.local_user)
-        self.assertEqual(report.user, self.rat)
+        self.assertEqual(report.reported_user, self.rat)
 
     def test_report_link(self):
         """a user reports a link as spam"""

From f5c3b6250e70bf31fa9c1d866f460f0aa3bb2026 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Wed, 3 Apr 2024 10:55:02 -0700
Subject: [PATCH 09/18] Makes report button work without javascript

---
 bookwyrm/templates/snippets/report_button.html | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index ce795f5bec..f54ddd9660 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -4,14 +4,16 @@
 {% with 0|uuid as report_uuid %}
 
 {% join "report" report_uuid as modal_id %}
-<button
-    class="button is-small is-danger is-light is-fullwidth {{ class }}"
-    type="button"
-    data-modal-open="{{ modal_id }}"
-    {% if is_current %}disabled{% endif %}
->
-    {% trans "Report" %}
-</button>
+<form name="fallback_form_{{ 0|uuid }}" method="GET" action="{% url 'report' user_id=user.id %}" autocomplete="off">
+    <button
+        class="button is-small is-danger is-light is-fullwidth {{ class }}"
+        type="submit"
+        data-modal-open="{{ modal_id }}"
+        {% if is_current %}disabled{% endif %}
+    >
+        {% trans "Report" %}
+    </button>
+</form>
 {% include 'snippets/report_modal.html' with reported_user=user id=modal_id status_id=status.id %}
 
 {% endwith %}

From 875c7122f3d6152b05f4eba9938d1a37c0b9b984 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Wed, 3 Apr 2024 10:58:26 -0700
Subject: [PATCH 10/18] Fixes static view of report form in no js mode

---
 bookwyrm/views/report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/report.py b/bookwyrm/views/report.py
index 121b7a232e..de438472bc 100644
--- a/bookwyrm/views/report.py
+++ b/bookwyrm/views/report.py
@@ -18,7 +18,7 @@ def get(self, request, user_id=None, status_id=None, link_id=None):
         data = {"user": None}
         if user_id:
             # but normally we should have an error if the user is not found
-            data["user"] = get_object_or_404(models.User, id=user_id)
+            data["reported_user"] = get_object_or_404(models.User, id=user_id)
 
         if status_id:
             data["status"] = status_id

From 2e4e96525b479ac8565e3d8aa001c9870441428a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Wed, 3 Apr 2024 11:19:51 -0700
Subject: [PATCH 11/18] Adds first-pass test for incoming reports

I'm writing this offline so I can't check what the actual Flag activity
spec looks like from Mastodon.
---
 bookwyrm/activitypub/verbs.py                 |  5 ++
 bookwyrm/tests/views/inbox/test_inbox_flag.py | 64 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_flag.py

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 13a303af71..ca56429918 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -278,3 +278,8 @@ class Flag(Verb):
     object: List[str] = None
     links: List[str] = None
     type: str = "Flag"
+    content: str = None
+
+    def action(self, allow_external_connections=False):
+        """usually we just want to update and save"""
+        self.to_model(allow_external_connections=allow_external_connections)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_flag.py b/bookwyrm/tests/views/inbox/test_inbox_flag.py
new file mode 100644
index 0000000000..3246c14886
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_flag.py
@@ -0,0 +1,64 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+import responses
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxFlag(TestCase):
+    """inbox tests"""
+
+    @classmethod
+    def setUpTestData(cls):  # pylint: disable=invalid-name
+        """basic user and book data"""
+        with (
+            patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
+            patch("bookwyrm.activitystreams.populate_stream_task.delay"),
+            patch("bookwyrm.lists_stream.populate_lists_task.delay"),
+        ):
+            cls.local_user = models.User.objects.create_user(
+                "mouse@example.com",
+                "mouse@mouse.com",
+                "mouseword",
+                local=True,
+                localname="mouse",
+            )
+        cls.local_user.remote_id = "https://example.com/user/mouse"
+        cls.local_user.save(broadcast=False, update_fields=["remote_id"])
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            cls.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+    @responses.activate
+    def test_flag_local_user(self):
+        """Serialize a report from a remote server"""
+        # TODO: is this actually what a Flag object from mastodon looks like?
+        activity = {
+            "id": "https://example.com/shelfbook/6189#add",
+            "type": "Flag",
+            "actor": self.remote_user.remote_id,
+            "object": {},
+            "to": self.local_user.remote_id,
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        # a report should now exist
+        self.assertTrue(
+            models.Report.objects.filter(
+                user=self.remote_user, reported_user=self.local_user
+            ).exists()
+        )

From e0719b34ab7f44787e276c75e5c29078ef4076d7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Wed, 3 Apr 2024 11:20:28 -0700
Subject: [PATCH 12/18] Json view of admin report

---
 bookwyrm/urls.py                | 2 +-
 bookwyrm/views/admin/reports.py | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index bfa1aacce0..f2be3b2f33 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -282,7 +282,7 @@
         r"^settings/reports/?$", views.ReportsAdmin.as_view(), name="settings-reports"
     ),
     re_path(
-        r"^settings/reports/(?P<report_id>\d+)/?$",
+        r"^settings/reports/(?P<report_id>\d+)(.json)?/?$",
         views.ReportAdmin.as_view(),
         name="settings-report",
     ),
diff --git a/bookwyrm/views/admin/reports.py b/bookwyrm/views/admin/reports.py
index 1a17f588e4..85ff7b0029 100644
--- a/bookwyrm/views/admin/reports.py
+++ b/bookwyrm/views/admin/reports.py
@@ -8,8 +8,9 @@
 from django.views import View
 
 from bookwyrm import forms, models
+from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.models.report import USER_SUSPENSION, USER_UNSUSPENSION, USER_DELETION
-from bookwyrm.views.helpers import redirect_to_referer
+from bookwyrm.views.helpers import redirect_to_referer, is_api_request
 from bookwyrm.settings import PAGE_LENGTH
 
 
@@ -73,8 +74,12 @@ class ReportAdmin(View):
 
     def get(self, request, report_id):
         """load a report"""
+        report = get_object_or_404(models.Report, id=report_id)
+        if is_api_request(request):
+            return ActivitypubResponse(report.to_activity(**request.GET))
+
         data = {
-            "report": get_object_or_404(models.Report, id=report_id),
+            "report": report,
             "group_form": forms.UserGroupForm(),
         }
         return TemplateResponse(request, "settings/reports/report.html", data)

From a920c115ad75dd3835dd284791ca576ea823c421 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Sat, 24 Aug 2024 15:12:20 -0700
Subject: [PATCH 13/18] Adds merge migration

---
 bookwyrm/migrations/0209_merge_20240824_2211.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0209_merge_20240824_2211.py

diff --git a/bookwyrm/migrations/0209_merge_20240824_2211.py b/bookwyrm/migrations/0209_merge_20240824_2211.py
new file mode 100644
index 0000000000..68b8b41257
--- /dev/null
+++ b/bookwyrm/migrations/0209_merge_20240824_2211.py
@@ -0,0 +1,13 @@
+# Generated by Django 4.2.15 on 2024-08-24 22:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0200_merge_20240403_1728"),
+        ("bookwyrm", "0208_merge_0207_merge_20240629_0626_0207_sqlparse_update"),
+    ]
+
+    operations = []

From 063f6d6e03d5899212796a4ed0ef2bc08c15ee2d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Sat, 24 Aug 2024 15:34:08 -0700
Subject: [PATCH 14/18] Adds list of "object"s to activitypub flag object

---
 bookwyrm/models/report.py                  | 19 ++++++++++++++++---
 bookwyrm/tests/models/test_report_model.py |  4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 2449afb981..9c242e07dc 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -3,7 +3,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from bookwyrm import activitypub
-from bookwyrm.settings import BASE_URL, DOMAIN
+from bookwyrm.settings import BASE_URL
 from .activitypub_mixin import ActivityMixin
 from .base_model import BookWyrmModel
 from . import fields
@@ -43,17 +43,30 @@ class Report(ActivityMixin, BookWyrmModel):
         blank=True,
         activitypub_field="to",
     )
-    status = fields.ForeignKey(
+    status = models.ForeignKey(
         "Status",
         null=True,
         blank=True,
         on_delete=models.PROTECT,
-        activitypub_field="object",
     )
     links = fields.ManyToManyField("Link", blank=True)
     resolved = models.BooleanField(default=False)
     allow_broadcast = models.BooleanField(default=False)
 
+    def to_activity_dataclass(self, **kwargs):
+        """generate the objects field"""
+        activity = super().to_activity_dataclass(**kwargs)
+        activity.object = self.object()
+        return activity
+
+    def object(self):
+        """Generate a list of reported objects in a format Mastodon will like"""
+        items = [self.reported_user.remote_id]
+        if self.status:
+            items.append(self.status.remote_id)
+
+        return items
+
     def broadcast(self, activity, sender, *args, **kwargs):
         """only need to send an activity for remote offenders"""
         # don't try to broadcast if the reporter doesn't want you to,
diff --git a/bookwyrm/tests/models/test_report_model.py b/bookwyrm/tests/models/test_report_model.py
index 95485862e6..aa4cb0b5f7 100644
--- a/bookwyrm/tests/models/test_report_model.py
+++ b/bookwyrm/tests/models/test_report_model.py
@@ -9,7 +9,7 @@ class Relationship(TestCase):
     """following, blocking, stuff like that"""
 
     @classmethod
-    def setUpTestData(self):  # pylint: disable=bad-classmethod-argument, invalid-name
+    def setUpTestData(self):  # pylint: disable=bad-classmethod-argument
         """we need some users for this"""
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
@@ -45,7 +45,7 @@ def test_report_local_user(self):
         self.assertEqual(activity["type"], "Flag")
         self.assertEqual(activity["actor"], self.local_user.remote_id)
         self.assertEqual(activity["to"], self.another_local_user.remote_id)
-        # self.assertEqual(activity["object"], [self.another_local_user.remote_id])
+        self.assertEqual(activity["object"], [self.another_local_user.remote_id])
         self.assertEqual(report.get_recipients(), [])
 
     def test_report_remote_user_with_broadcast(self):

From c76087e21dd4955d786c7c924bc0772c5cb73fb1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Sat, 24 Aug 2024 16:24:07 -0700
Subject: [PATCH 15/18] Get flagged status out of incoming Flag activity

---
 bookwyrm/activitypub/verbs.py                 | 26 +++++++++--
 bookwyrm/tests/views/inbox/test_inbox_flag.py | 44 +++++++++++++------
 2 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 30554e2463..b24a0e15c3 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -3,7 +3,12 @@
 from typing import List
 from django.apps import apps
 
-from .base_activity import ActivityObject, Signature, resolve_remote_id
+from .base_activity import (
+    ActivityObject,
+    ActivitySerializerError,
+    Signature,
+    resolve_remote_id,
+)
 from .ordered_collection import CollectionItem
 
 
@@ -277,5 +282,20 @@ class Flag(Verb):
     content: str = None
 
     def action(self, allow_external_connections=False):
-        """usually we just want to update and save"""
-        self.to_model(allow_external_connections=allow_external_connections)
+        """Create the report and attach reported statuses"""
+        report = self.to_model(allow_external_connections=allow_external_connections)
+        # go through "objects" and figure out what they are
+        for obj in self.object:
+            # what type of obj is it?
+            try:
+                item = resolve_remote_id(
+                    remote_id=obj,
+                    save=False,
+                    model="Status",
+                    allow_external_connections=allow_external_connections,
+                )
+            except ActivitySerializerError:
+                continue
+            report.status = item
+            report.save()
+            break
diff --git a/bookwyrm/tests/views/inbox/test_inbox_flag.py b/bookwyrm/tests/views/inbox/test_inbox_flag.py
index 3246c14886..004e8423e4 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_flag.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_flag.py
@@ -2,17 +2,15 @@
 from unittest.mock import patch
 
 from django.test import TestCase
-import responses
 
 from bookwyrm import models, views
 
 
-# pylint: disable=too-many-public-methods
 class InboxFlag(TestCase):
     """inbox tests"""
 
     @classmethod
-    def setUpTestData(cls):  # pylint: disable=invalid-name
+    def setUpTestData(cls):
         """basic user and book data"""
         with (
             patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
@@ -26,7 +24,6 @@ def setUpTestData(cls):  # pylint: disable=invalid-name
                 local=True,
                 localname="mouse",
             )
-        cls.local_user.remote_id = "https://example.com/user/mouse"
         cls.local_user.save(broadcast=False, update_fields=["remote_id"])
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             cls.remote_user = models.User.objects.create_user(
@@ -39,26 +36,47 @@ def setUpTestData(cls):  # pylint: disable=invalid-name
                 outbox="https://example.com/users/rat/outbox",
             )
 
+        cls.status = models.Status.objects.create(
+            user=cls.local_user, content="bad things"
+        )
+
         models.SiteSettings.objects.create()
 
-    @responses.activate
     def test_flag_local_user(self):
         """Serialize a report from a remote server"""
-        # TODO: is this actually what a Flag object from mastodon looks like?
         activity = {
-            "id": "https://example.com/shelfbook/6189#add",
+            "id": "https://example.com/settings/reports/6189",
+            "type": "Flag",
+            "actor": self.remote_user.remote_id,
+            "object": [self.local_user.remote_id],
+            "to": self.local_user.remote_id,
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "content": "hello hello",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        # a report should now exist
+        report = models.Report.objects.get(
+            user=self.remote_user, reported_user=self.local_user
+        )
+        self.assertEqual(report.note, "hello hello")
+
+    def test_flag_local_user_with_statuses(self):
+        """A report that includes a user and a status"""
+        activity = {
+            "id": "https://example.com/settings/reports/6189",
             "type": "Flag",
             "actor": self.remote_user.remote_id,
-            "object": {},
+            "object": [self.local_user.remote_id, self.status.remote_id],
             "to": self.local_user.remote_id,
-            "cc": ["https://example.com/user/mouse/followers"],
             "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "content": "hello hello",
             "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
         # a report should now exist
-        self.assertTrue(
-            models.Report.objects.filter(
-                user=self.remote_user, reported_user=self.local_user
-            ).exists()
+        report = models.Report.objects.get(
+            user=self.remote_user, reported_user=self.local_user
         )
+        self.assertEqual(report.note, "hello hello")
+        self.assertEqual(report.status, self.status)

From 0dcd95dca06e80848d357c9aae01ab0eb0c6da02 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Sat, 24 Aug 2024 16:44:31 -0700
Subject: [PATCH 16/18] Converts status to many to many field on report model

This allows us to support mastodon reports that include multiple statuses
---
 bookwyrm/activitypub/verbs.py                 |  4 +-
 bookwyrm/forms/forms.py                       |  9 +++-
 ...210_report_statuses_alter_report_status.py | 52 +++++++++++++++++++
 ...ove_report_status_alter_report_statuses.py | 22 ++++++++
 bookwyrm/models/report.py                     |  7 ++-
 .../templates/settings/reports/report.html    | 18 ++++---
 .../settings/reports/report_header.html       |  2 +-
 bookwyrm/templates/snippets/report_modal.html |  2 +-
 bookwyrm/tests/views/inbox/test_inbox_flag.py |  2 +-
 9 files changed, 100 insertions(+), 18 deletions(-)
 create mode 100644 bookwyrm/migrations/0210_report_statuses_alter_report_status.py
 create mode 100644 bookwyrm/migrations/0211_remove_report_status_alter_report_statuses.py

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index b24a0e15c3..251687bb38 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -296,6 +296,4 @@ def action(self, allow_external_connections=False):
                 )
             except ActivitySerializerError:
                 continue
-            report.status = item
-            report.save()
-            break
+            report.statuses.add(item)
diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py
index 96d8142a58..d43711c22a 100644
--- a/bookwyrm/forms/forms.py
+++ b/bookwyrm/forms/forms.py
@@ -44,7 +44,14 @@ class Meta:
 class ReportForm(CustomForm):
     class Meta:
         model = models.Report
-        fields = ["reported_user", "user", "status", "links", "note", "allow_broadcast"]
+        fields = [
+            "reported_user",
+            "user",
+            "statuses",
+            "links",
+            "note",
+            "allow_broadcast",
+        ]
 
 
 class ReadThroughForm(CustomForm):
diff --git a/bookwyrm/migrations/0210_report_statuses_alter_report_status.py b/bookwyrm/migrations/0210_report_statuses_alter_report_status.py
new file mode 100644
index 0000000000..194547f006
--- /dev/null
+++ b/bookwyrm/migrations/0210_report_statuses_alter_report_status.py
@@ -0,0 +1,52 @@
+# Generated by Django 4.2.15 on 2024-08-24 23:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def copy_status_field(apps, schema_editor):
+    """Move the foreign key status to the new many to many field"""
+    reports = apps.get_model("bookwyrm", "Report")
+    db_alias = schema_editor.connection.alias
+    for report in reports.objects.using(db_alias).filter(status__isnull=False):
+        report.statuses.add(report.status)
+
+
+def reverse_copy_status_field(apps, schema_editor):
+    """Move the first status in the many to many to the old FK"""
+    reports = apps.get_model("bookwyrm", "Report")
+    db_alias = schema_editor.connection.alias
+    for report in reports.objects.using(db_alias).filter(statuses__isnull=False):
+        report.status = report.statuses.first()
+        report.save(broadcast=False, updated_fields=["status"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0209_merge_20240824_2211"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="report",
+            name="statuses",
+            field=models.ManyToManyField(
+                blank=True,
+                null=True,
+                related_name="status_intermediary_name",
+                to="bookwyrm.status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="status",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.status",
+            ),
+        ),
+        migrations.RunPython(copy_status_field, reverse_code=reverse_copy_status_field),
+    ]
diff --git a/bookwyrm/migrations/0211_remove_report_status_alter_report_statuses.py b/bookwyrm/migrations/0211_remove_report_status_alter_report_statuses.py
new file mode 100644
index 0000000000..18d2c687be
--- /dev/null
+++ b/bookwyrm/migrations/0211_remove_report_status_alter_report_statuses.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.15 on 2024-08-24 23:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0210_report_statuses_alter_report_status"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="report",
+            name="status",
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="statuses",
+            field=models.ManyToManyField(blank=True, null=True, to="bookwyrm.status"),
+        ),
+    ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 9c242e07dc..b0e5d88161 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -43,11 +43,10 @@ class Report(ActivityMixin, BookWyrmModel):
         blank=True,
         activitypub_field="to",
     )
-    status = models.ForeignKey(
+    statuses = models.ManyToManyField(
         "Status",
         null=True,
         blank=True,
-        on_delete=models.PROTECT,
     )
     links = fields.ManyToManyField("Link", blank=True)
     resolved = models.BooleanField(default=False)
@@ -62,8 +61,8 @@ def to_activity_dataclass(self, **kwargs):
     def object(self):
         """Generate a list of reported objects in a format Mastodon will like"""
         items = [self.reported_user.remote_id]
-        if self.status:
-            items.append(self.status.remote_id)
+        if self.statuses:
+            items += self.statuses.values_list("remote_id", flat=True)
 
         return items
 
diff --git a/bookwyrm/templates/settings/reports/report.html b/bookwyrm/templates/settings/reports/report.html
index e0c86af6ca..5d45a721e4 100644
--- a/bookwyrm/templates/settings/reports/report.html
+++ b/bookwyrm/templates/settings/reports/report.html
@@ -32,14 +32,18 @@
     </details>
 </div>
 
-{% if report.status %}
+{% if report.statuses.exists %}
 <div class="block">
-    <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 %}
+    <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
+    {% for status in report.statuses.all %}
+    <div>
+        {% if status.deleted %}
+        <em>{% trans "Status has been deleted" %}</em>
+        {% else %}
+        {% include 'snippets/status/status.html' with status=status|load_subclass moderation_mode=True %}
+        {% endif %}
+    </div>
+    {% endfor %}
 </div>
 {% endif %}
 
diff --git a/bookwyrm/templates/settings/reports/report_header.html b/bookwyrm/templates/settings/reports/report_header.html
index 1c9b01c9b2..0c610f2df4 100644
--- a/bookwyrm/templates/settings/reports/report_header.html
+++ b/bookwyrm/templates/settings/reports/report_header.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load utilities %}
 
-{% if report.status %}
+{% if report.statuses.exists %}
 
 {% blocktrans trimmed with report_id=report.id username=report.reported_user|username %}
 Report #{{ report_id }}: Status posted by @{{ username }}
diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html
index b0e5925f6a..13ff859fda 100644
--- a/bookwyrm/templates/snippets/report_modal.html
+++ b/bookwyrm/templates/snippets/report_modal.html
@@ -23,7 +23,7 @@
 <input type="hidden" name="user" value="{{ request.user.id }}">
 <input type="hidden" name="reported_user" value="{{ reported_user.id }}">
 {% if status_id %}
-<input type="hidden" name="status" value="{{ status_id }}">
+<input type="hidden" name="statuses" value="{{ status_id }}">
 {% endif %}
 {% if link %}
 <input type="hidden" name="links" value="{{ link.id }}">
diff --git a/bookwyrm/tests/views/inbox/test_inbox_flag.py b/bookwyrm/tests/views/inbox/test_inbox_flag.py
index 004e8423e4..4270024ebb 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_flag.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_flag.py
@@ -79,4 +79,4 @@ def test_flag_local_user_with_statuses(self):
             user=self.remote_user, reported_user=self.local_user
         )
         self.assertEqual(report.note, "hello hello")
-        self.assertEqual(report.status, self.status)
+        self.assertEqual(report.statuses.first(), self.status)

From 6e5d064ebf1d97d33502158888240586bd08637b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Sat, 24 Aug 2024 16:52:19 -0700
Subject: [PATCH 17/18] Updates tests for reports

---
 bookwyrm/tests/models/test_report_model.py    | 26 +++++++++++++++++++
 bookwyrm/tests/views/inbox/test_inbox_flag.py | 21 ++++++++++-----
 bookwyrm/tests/views/test_report.py           |  1 -
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/tests/models/test_report_model.py b/bookwyrm/tests/models/test_report_model.py
index aa4cb0b5f7..70c081580b 100644
--- a/bookwyrm/tests/models/test_report_model.py
+++ b/bookwyrm/tests/models/test_report_model.py
@@ -48,6 +48,32 @@ def test_report_local_user(self):
         self.assertEqual(activity["object"], [self.another_local_user.remote_id])
         self.assertEqual(report.get_recipients(), [])
 
+    def test_report_local_user_status(self):
+        """a report/flag within an instance"""
+        report = models.Report.objects.create(
+            user=self.local_user,
+            note="oh no bad",
+            reported_user=self.another_local_user,
+        )
+        status_1 = models.Status.objects.create(
+            user=self.local_user, content="bad things"
+        )
+        status_2 = models.Status.objects.create(
+            user=self.local_user, content="bad things"
+        )
+        report.statuses.add(status_1)
+        report.statuses.add(status_2)
+
+        activity = report.to_activity()
+        self.assertEqual(activity["type"], "Flag")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["to"], self.another_local_user.remote_id)
+        self.assertEqual(len(activity["object"]), 3)
+        self.assertEqual(activity["object"][0], self.another_local_user.remote_id)
+        self.assertTrue(status_1.remote_id in activity["object"])
+        self.assertTrue(status_2.remote_id in activity["object"])
+        self.assertEqual(report.get_recipients(), [])
+
     def test_report_remote_user_with_broadcast(self):
         """a report to the outside needs to broadcast"""
         with patch("bookwyrm.models.report.Report.broadcast") as broadcast_mock:
diff --git a/bookwyrm/tests/views/inbox/test_inbox_flag.py b/bookwyrm/tests/views/inbox/test_inbox_flag.py
index 4270024ebb..850633bc14 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_flag.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_flag.py
@@ -36,10 +36,6 @@ def setUpTestData(cls):
                 outbox="https://example.com/users/rat/outbox",
             )
 
-        cls.status = models.Status.objects.create(
-            user=cls.local_user, content="bad things"
-        )
-
         models.SiteSettings.objects.create()
 
     def test_flag_local_user(self):
@@ -63,11 +59,22 @@ def test_flag_local_user(self):
 
     def test_flag_local_user_with_statuses(self):
         """A report that includes a user and a status"""
+        status_1 = models.Status.objects.create(
+            user=self.local_user, content="bad things"
+        )
+        status_2 = models.Status.objects.create(
+            user=self.local_user, content="bad things"
+        )
+
         activity = {
             "id": "https://example.com/settings/reports/6189",
             "type": "Flag",
             "actor": self.remote_user.remote_id,
-            "object": [self.local_user.remote_id, self.status.remote_id],
+            "object": [
+                self.local_user.remote_id,
+                status_1.remote_id,
+                status_2.remote_id,
+            ],
             "to": self.local_user.remote_id,
             "published": "Mon, 25 May 2020 19:31:20 GMT",
             "content": "hello hello",
@@ -79,4 +86,6 @@ def test_flag_local_user_with_statuses(self):
             user=self.remote_user, reported_user=self.local_user
         )
         self.assertEqual(report.note, "hello hello")
-        self.assertEqual(report.statuses.first(), self.status)
+        self.assertEqual(report.statuses.count(), 2)
+        self.assertTrue(report.statuses.filter(id=status_1.id).exists())
+        self.assertTrue(report.statuses.filter(id=status_2.id).exists())
diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py
index 8512378a2f..ea89c43cd4 100644
--- a/bookwyrm/tests/views/test_report.py
+++ b/bookwyrm/tests/views/test_report.py
@@ -8,7 +8,6 @@
 from bookwyrm.tests.validate_html import validate_html
 
 
-# pylint: disable=invalid-name
 class ReportViews(TestCase):
     """every response to a get request, html or json"""
 

From e21f57d27d917896eed14255a3f2ad4d069f1b71 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mouse.reeve@gmail.com>
Date: Sun, 25 Aug 2024 18:07:27 -0700
Subject: [PATCH 18/18] Updates antispam automoderator to handle new statuses
 field

---
 bookwyrm/models/antispam.py           | 16 ++++++++--------
 bookwyrm/tests/models/test_automod.py |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/models/antispam.py b/bookwyrm/models/antispam.py
index da58e8aa68..53af93ef00 100644
--- a/bookwyrm/models/antispam.py
+++ b/bookwyrm/models/antispam.py
@@ -140,14 +140,14 @@ def automod_statuses(reporter):
     ).distinct()
 
     report_model = apps.get_model("bookwyrm", "Report", require_ready=True)
-    return report_model.objects.bulk_create(
-        [
-            report_model(
+    reports = []
+    for status in statuses:
+        with transaction.atomic():
+            report = report_model.objects.create(
                 user=reporter,
                 note=_("Automatically generated report"),
-                reported_user=s.user,
-                status=s,
+                reported_user=status.user,
             )
-            for s in statuses
-        ]
-    )
+            report.statuses.add(status)
+            reports.append(report)
+    return reports
diff --git a/bookwyrm/tests/models/test_automod.py b/bookwyrm/tests/models/test_automod.py
index 5e10eb4d07..a7cd63b539 100644
--- a/bookwyrm/tests/models/test_automod.py
+++ b/bookwyrm/tests/models/test_automod.py
@@ -79,6 +79,6 @@ def test_automod_status(self, *_):
 
         reports = models.Report.objects.all()
         self.assertEqual(reports.count(), 1)
-        self.assertEqual(reports.first().status, status)
+        self.assertEqual(reports.first().statuses.first(), status)
         self.assertEqual(reports.first().user, self.local_user)
         self.assertEqual(models.Notification.objects.count(), 1)