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] 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 a8a435781..988b65f4f 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -64,9 +64,9 @@ class Report(ActivityMixin, BookWyrmModel):
 
     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 67a2d8cc6..b0e5925f6 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 cb6942a27..95485862e 100644
--- a/bookwyrm/tests/models/test_report_model.py
+++ b/bookwyrm/tests/models/test_report_model.py
@@ -45,3 +45,17 @@ class Relationship(TestCase):
         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 3b72a64d6..7e1b4125e 100644
--- a/bookwyrm/tests/views/admin/test_reports.py
+++ b/bookwyrm/tests/views/admin/test_reports.py
@@ -118,7 +118,7 @@ class ReportViews(TestCase):
         # 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 @@ class ReportViews(TestCase):
         # 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()
         )