TZ Middleware __call__ return a definite output

1 files changed, 9 insertions, 9 deletions

diff --git a/middleware/tz.py b/middleware/tz.py
index 05130dbb..62d98965 100644
--- a/middleware/tz.py
+++ b/middleware/tz.py
@@ -13,20 +13,20 @@ class TimezoneMiddleware(object):
     def __call__(self, request):
         # get the user's timezone from the cookie
         user_timezone = request.COOKIES.get('user_timezone')
-
+        remote_ip = request.META.get('REMOTE_ADDR')
         if not user_timezone:
             x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
-            
             if x_forwarded_for:
                 remote_ip = x_forwarded_for.split(',')[0]
             else:
                 remote_ip = request.META.get('REMOTE_ADDR')
         
-            geo_data = requests.get(f'http://ip-api.com/json/{remote_ip}').json()
-            user_timezone = geo_data['timezone'] if 'timezone' in geo_data else 'UTC'
+        geo_data = requests.get(f'http://ip-api.com/json/{remote_ip}').json()
+        user_timezone = geo_data['timezone'] if 'timezone' in geo_data else 'UTC'
 
-            if user_timezone:
-                response = self.get_response(request)
-                response.set_cookie('user_timezone', user_timezone, max_age=31536000)
-                return response
-            return self.get_response(request)
+        if user_timezone:
+            response = self.get_response(request)
+            response.set_cookie('user_timezone', user_timezone)
+            return response
+        
+        return self.get_response(request)