From 18183b36de5c424bc377dab936ae1036bfb27bec Mon Sep 17 00:00:00 2001
From: vas3k <me@vas3k.ru>
Date: Mon, 1 Jul 2024 15:59:58 +0200
Subject: [PATCH] fix: leap year + 500 error on "me" when unauthorized

---
 payments/products.py    |  8 ++++----
 users/api.py            |  2 +-
 users/views/profile.py  |  8 ++++----
 users/views/settings.py | 14 +++++++-------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/payments/products.py b/payments/products.py
index 21723d02f..ba7697180 100644
--- a/payments/products.py
+++ b/payments/products.py
@@ -72,7 +72,7 @@ def club_invite_activator(product, payment, user):
         "recurrent": False,
         "activator": club_subscription_activator,
         "data": {
-            "timedelta": timedelta(days=365),
+            "timedelta": timedelta(days=366),
         },
     },
     "club1_recurrent_yearly": {
@@ -84,7 +84,7 @@ def club_invite_activator(product, payment, user):
         "recurrent": "yearly",
         "activator": club_subscription_activator,
         "data": {
-            "timedelta": timedelta(days=365),
+            "timedelta": timedelta(days=366),
         },
     },
     "club1_recurrent_monthly": {
@@ -108,7 +108,7 @@ def club_invite_activator(product, payment, user):
         "recurrent": "yearly",
         "activator": club_subscription_activator,
         "data": {
-            "timedelta": timedelta(days=365),
+            "timedelta": timedelta(days=366),
         },
     },
     "legacy_club1_recurrent_monthly": {
@@ -120,7 +120,7 @@ def club_invite_activator(product, payment, user):
         "recurrent": "monthly",
         "activator": club_subscription_activator,
         "data": {
-            "timedelta": timedelta(days=365),
+            "timedelta": timedelta(days=366),
         },
     },
     "club3": {
diff --git a/users/api.py b/users/api.py
index ac8417b06..2f2bc1711 100644
--- a/users/api.py
+++ b/users/api.py
@@ -8,7 +8,7 @@
 
 @api(require_auth=True)
 def api_profile(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         user_slug = request.me.slug
 
     user = get_object_or_404(User, slug=user_slug)
diff --git a/users/views/profile.py b/users/views/profile.py
index dd87fe605..cc77b84bb 100644
--- a/users/views/profile.py
+++ b/users/views/profile.py
@@ -21,7 +21,7 @@
 
 
 def profile(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("profile", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -109,7 +109,7 @@ def profile(request, user_slug):
 
 @require_auth
 def profile_comments(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("profile_comments", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -126,7 +126,7 @@ def profile_comments(request, user_slug):
 
 
 def profile_posts(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("profile_posts", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -147,7 +147,7 @@ def profile_posts(request, user_slug):
 
 
 def profile_badges(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("profile_badges", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
diff --git a/users/views/settings.py b/users/views/settings.py
index 4c0b3d995..012062a1c 100644
--- a/users/views/settings.py
+++ b/users/views/settings.py
@@ -18,7 +18,7 @@
 
 @require_auth
 def profile_settings(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("profile_settings", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -30,7 +30,7 @@ def profile_settings(request, user_slug):
 
 @require_auth
 def edit_profile(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("edit_profile", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -53,7 +53,7 @@ def edit_profile(request, user_slug):
 
 @require_auth
 def edit_account(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("edit_account", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -70,7 +70,7 @@ def edit_account(request, user_slug):
 
 @require_auth
 def edit_notifications(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("edit_notifications", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -91,7 +91,7 @@ def edit_notifications(request, user_slug):
 
 @require_auth
 def edit_payments(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("edit_payments", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -127,7 +127,7 @@ def edit_payments(request, user_slug):
 
 @require_auth
 def edit_bot(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("edit_bot", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)
@@ -139,7 +139,7 @@ def edit_bot(request, user_slug):
 
 @require_auth
 def edit_data(request, user_slug):
-    if user_slug == "me":
+    if user_slug == "me" and request.me:
         return redirect("edit_data", request.me.slug, permanent=False)
 
     user = get_object_or_404(User, slug=user_slug)