From ecc68a1e11e9e6067a65bab1d3af62549b0dd615 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Nov 2023 23:36:00 +0000
Subject: [PATCH 1/2] Update django-recaptcha requirement from ~=3.0.0 to
 ~=4.0.0

Updates the requirements on [django-recaptcha](https://github.com/torchbox/django-recaptcha) to permit the latest version.
- [Release notes](https://github.com/torchbox/django-recaptcha/releases)
- [Changelog](https://github.com/torchbox/django-recaptcha/blob/main/CHANGELOG.md)
- [Commits](https://github.com/torchbox/django-recaptcha/compare/3.0.0...4.0.0)

---
updated-dependencies:
- dependency-name: django-recaptcha
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index b95576784..1c00ae50a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ crispy-bootstrap5==0.7
 # we might need to think about migrating away from this completely
 django-bootstrap-breadcrumbs2==1.0.0
 django-formtools~=2.4
-django-recaptcha~=3.0.0
+django-recaptcha~=4.0.0
 Django==4.2.6
 django-activity-stream==2.0.0
 django-axes==6.1.1

From b10df79f82997392f8730429488fe64e0fcb515b Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Tue, 21 Nov 2023 16:23:12 +0100
Subject: [PATCH 2/2] Update django recaptcha package names

---
 wger/core/forms.py          | 6 +++---
 wger/core/models/profile.py | 4 ++--
 wger/settings_global.py     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wger/core/forms.py b/wger/core/forms.py
index ee367da7b..c6e9bf7c4 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -36,8 +36,6 @@
 from django.utils.translation import gettext as _
 
 # Third Party
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV3
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import (
     HTML,
@@ -48,6 +46,8 @@
     Row,
     Submit,
 )
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV3
 
 # wger
 from wger.core.models import UserProfile
@@ -196,7 +196,7 @@ def clean_email(self):
         if not email:
             return email
         try:
-            #Performs a case-insensitive lookup
+            # Performs a case-insensitive lookup
             user = User.objects.get(email__iexact=email)
             if user.email == self.instance.email:
                 return email
diff --git a/wger/core/models/profile.py b/wger/core/models/profile.py
index 8edda7b73..ba7ca646f 100644
--- a/wger/core/models/profile.py
+++ b/wger/core/models/profile.py
@@ -523,8 +523,8 @@ def user_bodyweight(self, weight):
         """
         if (
             not WeightEntry.objects.filter(user=self.user).exists() or (
-                datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date
-                > datetime.timedelta(days=3)
+                datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date >
+                datetime.timedelta(days=3)
             )
         ):
             entry = WeightEntry()
diff --git a/wger/settings_global.py b/wger/settings_global.py
index ec92e6279..8ea2a3da1 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -69,7 +69,7 @@
     'wger.measurements',
 
     # reCaptcha support, see https://github.com/praekelt/django-recaptcha
-    'captcha',
+    'django_recaptcha',
 
     # The sitemaps app
     'django.contrib.sitemaps',