From 8d659abe0669de885f08e208859b50b7424ded95 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Fri, 13 Sep 2019 06:08:28 +0200
Subject: [PATCH] See #890: factorisation
---
api/funkwhale_api/moderation/tasks.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/api/funkwhale_api/moderation/tasks.py b/api/funkwhale_api/moderation/tasks.py
index 4fa5c7fdb..91411ed2a 100644
--- a/api/funkwhale_api/moderation/tasks.py
+++ b/api/funkwhale_api/moderation/tasks.py
@@ -54,10 +54,11 @@ def send_new_report_email_to_moderators(report):
# we fallback on superusers
moderators = users_models.User.objects.filter(is_superuser=True)
moderators = sorted(moderators, key=lambda m: m.pk)
+ submitter_repr = (
+ report.submitter.full_username if report.submitter else report.submitter_email
+ )
subject = "[{} moderation - {}] New report from {}".format(
- settings.FUNKWHALE_HOSTNAME,
- report.get_type_display(),
- report.submitter.full_username if report.submitter else report.submitter_email,
+ settings.FUNKWHALE_HOSTNAME, report.get_type_display(), submitter_repr
)
detail_url = federation_utils.full_url(
"/manage/moderation/reports/{}".format(report.uuid)
@@ -68,10 +69,7 @@ def send_new_report_email_to_moderators(report):
unresolved_reports = models.Report.objects.filter(is_handled=False).count()
body = [
'{} just submitted a report in the "{}" category.'.format(
- report.submitter.full_username
- if report.submitter
- else report.submitter_email,
- report.get_type_display(),
+ submitter_repr, report.get_type_display()
),
"",
"Reported object: {} - {}".format(
--
GitLab