Merge branch 'dev'

shynet/analytics/tasks.py

@@ -62,8 +62,7 @@ def ingress_request(
                 last_seen__gt=timezone.now() - timezone.timedelta(minutes=10),
                 ip=ip,
                 user_agent=user_agent,
-            )
+            ).first()
-            .first()
             # We used to check for identifiers, but that can cause issues when people
             # re-open the page in a new tab, for example. It's better to match sessions
             # solely based on IP and user agent.

shynet/analytics/views/ingress.py

@@ -1,12 +1,12 @@
 import base64
 import json
 
+from django.conf import settings
 from django.http import HttpResponse
 from django.shortcuts import render, reverse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-from django.conf import settings
 from django.views.generic import TemplateView, View
 from ipware import get_client_ip
 

shynet/shynet/settings.py

@@ -256,4 +256,3 @@ ONLY_SUPERUSERS_CREATE = os.getenv("ONLY_SUPERUSERS_CREATE", "True") == "True"
 # Should the script use HTTPS to send the POST requests? The hostname is from
 # the django SITE default. (Edit it using the admin panel.)
 SCRIPT_USE_HTTPS = os.getenv("SCRIPT_USE_HTTPS", "True") == "True"
-