Model-based mail queuing

src/pretix/helpers/database.py

@@ -25,7 +25,7 @@ from django.conf import settings
 from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured
 from django.db import connection, transaction
 from django.db.models import (
-    Aggregate, Expression, F, Field, Lookup, OrderBy, Value,
+    Aggregate, Expression, F, Field, JSONField, Lookup, OrderBy, Value,
 )
 from django.utils.functional import lazy
 
@@ -154,6 +154,19 @@ class NotEqual(Lookup):
         return '%s <> %s' % (lhs, rhs), params
 
 
+@JSONField.register_lookup
+class ContainsString(Lookup):
+    lookup_name = 'containsstring'
+
+    def as_sql(self, compiler, connection):
+        if connection.vendor != "postgresql":
+            raise NotImplementedError("Lookup in JSON Array not supported on this database")
+        lhs, lhs_params = self.process_lhs(compiler, connection)
+        rhs, rhs_params = self.process_rhs(compiler, connection)
+        params = lhs_params + rhs_params
+        return '%s ? %s' % (lhs, rhs), params
+
+
 class PostgresWindowFrame(Expression):
     template = "%(frame_type)s BETWEEN %(start)s AND %(end)s"
 

src/pretix/helpers/security.py

@@ -32,7 +32,7 @@ from django_countries.fields import Country
 from geoip2.errors import AddressNotFoundError
 
 from pretix.base.i18n import language
-from pretix.base.services.mail import SendMailException, mail
+from pretix.base.services.mail import mail
 from pretix.helpers.http import get_client_ip
 from pretix.helpers.urls import build_absolute_uri
 
@@ -159,21 +159,18 @@ def handle_login_source(user, request):
         })
         if user.known_login_sources.count() > 1:
             # Do not send on first login or first login after introduction of this feature:
-            try:
-                with language(user.locale):
-                    mail(
-                        user.email,
-                        _('Login from new source detected'),
-                        'pretixcontrol/email/login_notice.txt',
-                        {
-                            'source': src,
-                            'country': Country(str(country)).name if country else _('Unknown country'),
-                            'instance': settings.PRETIX_INSTANCE_NAME,
-                            'url': build_absolute_uri('control:user.settings')
-                        },
-                        event=None,
-                        user=user,
-                        locale=user.locale
-                    )
-            except SendMailException:
-                pass  # Not much we can do
+            with language(user.locale):
+                mail(
+                    user.email,
+                    _('Login from new source detected'),
+                    'pretixcontrol/email/login_notice.txt',
+                    {
+                        'source': src,
+                        'country': Country(str(country)).name if country else _('Unknown country'),
+                        'instance': settings.PRETIX_INSTANCE_NAME,
+                        'url': build_absolute_uri('control:user.settings')
+                    },
+                    event=None,
+                    user=user,
+                    locale=user.locale
+                )