Federate reports

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

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
 
 
@@ -264,3 +269,31 @@ 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"
+    content: str = None
+
+    def action(self, allow_external_connections=False):
+        """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.statuses.add(item)

bookwyrm/emailing.py

@@ -51,9 +51,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()
 

bookwyrm/forms/forms.py

@@ -44,7 +44,14 @@ class Meta:
 class ReportForm(CustomForm):
     class Meta:
         model = models.Report
-        fields = ["user", "reporter", "status", "links", "note"]
+        fields = [
+            "reported_user",
+            "user",
+            "statuses",
+            "links",
+            "note",
+            "allow_broadcast",
+        ]
 
 
 class ReadThroughForm(CustomForm):

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,
+            ),
+        ),
+    ]

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",
+        ),
+    ]

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",
+        ),
+    ]

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
+            ),
+        ),
+    ]

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 = []

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 = []

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),
+    ]

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"),
+        ),
+    ]

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
         ]
@@ -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(
-                reporter=reporter,
+    reports = []
+    for status in statuses:
+        with transaction.atomic():
+            report = report_model.objects.create(
+                user=reporter,
                 note=_("Automatically generated report"),
-                user=s.user,
-                status=s,
+                reported_user=status.user,
             )
-            for s in statuses
-        ]
-    )
+            report.statuses.add(status)
+            reports.append(report)
+    return reports