Merge pull request #2184 from bookwyrm-social/userless-link-domain

Handle link domains with no associated user

bookwyrm/emailing.py

@@ -45,7 +45,8 @@ def moderation_report_email(report):
     """a report was created"""
     data = email_data()
     data["reporter"] = report.reporter.localname or report.reporter.username
-    data["reportee"] = report.user.localname or report.user.username
+    if report.user:
+        data["reportee"] = report.user.localname or report.user.username
     data["report_link"] = report.remote_id
 
     for admin in models.User.objects.filter(

bookwyrm/models/report.py

@@ -11,7 +11,7 @@ class Report(BookWyrmModel):
         "User", related_name="reporter", on_delete=models.PROTECT
     )
     note = models.TextField(null=True, blank=True)
-    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    user = models.ForeignKey("User", on_delete=models.PROTECT, null=True, blank=True)
     status = models.ForeignKey(
         "Status",
         null=True,

bookwyrm/templates/book/file_links/edit_links.html

@@ -42,7 +42,11 @@
                     <a href="{{ link.url }}" target="_blank" rel="noopener noreferrer">{{ link.url }}</a>
                 </td>
                 <td>
+                    {% if link.added_by %}
                     <a href="{% url 'user-feed' link.added_by.id %}">{{ link.added_by.display_name }}</a>
+                    {% else %}
+                    <em>{% trans "Unknown user" %}</em>
+                    {% endif %}
                 </td>
                 <td>
                     {{ link.filelink.filetype }}
@@ -50,7 +54,7 @@
                 <td>
                     {{ link.domain.name }}
                     <p>
-                        <a href="{% url 'report-link' link.added_by.id link.id %}">{% trans "Report spam" %}</a>
+                        <a href="{% url 'report-link' link.id %}">{% trans "Report spam" %}</a>
                     </p>
                 </td>
                 <td>

bookwyrm/templates/book/file_links/verification_modal.html

@@ -19,7 +19,7 @@ Is that where you'd like to go?
 {% block modal-footer %}
 {% if request.user.is_authenticated %}
 <div class="is-flex-grow-1">
-    <a href="{% url 'report-link' link.added_by.id link.id %}">{% trans "Report spam" %}</a>
+    <a href="{% url 'report-link' link.id %}">{% trans "Report spam" %}</a>
 </div>
 
 <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>

bookwyrm/templates/email/moderation_report/html_content.html

@@ -3,7 +3,19 @@
 
 {% block content %}
 <p>
-{% blocktrans %}@{{ reporter }} has flagged behavior by @{{ reportee }} for moderation. {% endblocktrans %}
+{% if report_link %}
+
+    {% blocktrans trimmed %}
+    @{{ reporter }} has flagged a link domain for moderation.
+    {% endblocktrans %}
+
+{% else %}
+
+    {% blocktrans trimmed %}
+    @{{ reporter }} has flagged behavior by @{{ reportee }} for moderation.
+    {% endblocktrans %}
+
+{% endif %}
 </p>
 
 {% trans "View report" as text %}

bookwyrm/templates/email/moderation_report/text_content.html

@@ -2,7 +2,15 @@
 {% load i18n %}
 {% block content %}
 
-{% blocktrans %}@{{ reporter}} has flagged behavior by @{{ reportee }} for moderation. {% endblocktrans %}
+{% if report_link %}
+{% blocktrans trimmed %}
+@{{ reporter }} has flagged a link domain for moderation.
+{% endblocktrans %}
+{% else %}
+{% blocktrans trimmed %}
+@{{ reporter }} has flagged behavior by @{{ reportee }} for moderation.
+{% endblocktrans %}
+{% endif %}
 
 {% trans "View report" %}
 {{ report_link }}

bookwyrm/templates/settings/link_domains/link_table.html

@@ -15,7 +15,11 @@
             <a href="{{ link.url }}" target="_blank" rel="noopener noreferrer">{{ link.url }}</a>
         </td>
         <td>
+            {% if link.added_by %}
             <a href="{% url 'settings-user' link.added_by.id %}">@{{ link.added_by|username }}</a>
+            {% else %}
+            <em>{% trans "Unknown user" %}</em>
+            {% endif %}
         </td>
         <td>
             {% if link.filelink.filetype %}

bookwyrm/templates/settings/reports/report.html

@@ -55,9 +55,11 @@
 </div>
 {% endif %}
 
+{% if report.user %}
 {% include 'settings/users/user_info.html' with user=report.user %}
 
 {% include 'settings/users/user_moderation_actions.html' with user=report.user %}
+{% endif %}
 
 <div class="block">
     <h3 class="title is-4">{% trans "Moderator Comments" %}</h3>

bookwyrm/templates/settings/reports/report_header.html

@@ -9,9 +9,15 @@ Report #{{ report_id }}: Status posted by @{{ username }}
 
 {% elif report.links.exists %}
 
-{% blocktrans trimmed with report_id=report.id username=report.user|username %}
+    {% if report.user %}
-Report #{{ report_id }}: Link added by @{{ username }}
+    {% blocktrans trimmed with report_id=report.id username=report.user|username %}
-{% endblocktrans %}
+    Report #{{ report_id }}: Link added by @{{ username }}
+    {% endblocktrans %}
+    {% else %}
+    {% blocktrans trimmed with report_id=report.id %}
+    Report #{{ report_id }}: Link domain
+    {% endblocktrans %}
+    {% endif %}
 
 {% else %}
 

bookwyrm/urls.py

@@ -287,7 +287,7 @@ urlpatterns = [
         name="report-status",
     ),
     re_path(
-        r"^report/(?P<user_id>\d+)/link/(?P<link_id>\d+)?$",
+        r"^report/link/(?P<link_id>\d+)?$",
         views.Report.as_view(),
         name="report-link",
     ),

bookwyrm/views/report.py

@@ -13,9 +13,13 @@ from bookwyrm import emailing, forms, models
 class Report(View):
     """Make reports"""
 
-    def get(self, request, user_id, status_id=None, link_id=None):
+    def get(self, request, user_id=None, status_id=None, link_id=None):
         """static view of report modal"""
-        data = {"user": get_object_or_404(models.User, id=user_id)}
+        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)
+
         if status_id:
             data["status"] = status_id
         if link_id: