yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-03 13:29:20 +02:00
Code Issues Releases Wiki Activity

Review fixes for report notifications not included in !880

Browse source
This commit is contained in:
Eliot Berriot 2019-09-13 06:13:53 +02:00
parent efaeb1bd81
commit c3dc4e2ab4
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/funkwhale_api/moderation/tasks.py
View file

@ -53,10 +53,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)
@ -67,10 +68,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(