From 18f771d508359b1f84ef55b9f4e1b77232bde683 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Sun, 26 Jan 2020 15:35:04 +0000 Subject: [PATCH] FIX: Use a setting for cooldown --- PyRIGS/settings.py | 7 ++++--- RIGS/signals.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 40767592..b787bdd1 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/ import os import raven import secrets +import datetime BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -44,9 +45,7 @@ if not DEBUG: INTERNAL_IPS = ['127.0.0.1'] -ADMINS = ( - [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'), ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')] -) +ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'), ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')] if DEBUG: ADMINS.append(('Testing Superuser', 'superuser@example.com')) @@ -184,6 +183,8 @@ if not DEBUG or EMAILER_TEST: else: EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +EMAIL_COOLDOWN = datetime.timedelta(minutes=15) + # Internationalization # https://docs.djangoproject.com/en/1.7/topics/i18n/ diff --git a/RIGS/signals.py b/RIGS/signals.py index d64ceca3..71a30856 100644 --- a/RIGS/signals.py +++ b/RIGS/signals.py @@ -111,7 +111,7 @@ def send_admin_awaiting_approval_email(user, request, **kwargs): # Bit more controlled than just emailing all superusers for admin in models.Profile.objects.filter(email__in=[y for x in settings.ADMINS for y in x]): # Check we've ever emailed them before and if so, if cooldown has passed. - if admin.last_emailed is None or admin.last_emailed + datetime.timedelta(minutes=15) <= timezone.now(): + if admin.last_emailed is None or admin.last_emailed + settings.EMAIL_COOLDOWN <= timezone.now(): context = { 'request': request, 'link_suffix': '/admin/RIGS/profile/?is_approved__exact=0',