From 5ab4a8400cbb1e4f1d72f02be967ce745fd4bc47 Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Sun, 27 Nov 2022 10:49:47 -0600
Subject: [PATCH] fix conflict

---
 files/routes/wrappers.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py
index caf13c5c7..1341a7bcb 100644
--- a/files/routes/wrappers.py
+++ b/files/routes/wrappers.py
@@ -18,7 +18,10 @@ def session_init():
 		session["session_id"] = secrets.token_hex(49)
 
 def calc_users(v):
-	if g.is_api_or_xhr: return
+	if g.is_api_or_xhr: 
+		g.loggedin_counter = 0
+		g.loggedout_counter = 0
+		return
 	loggedin = cache.get(f'{SITE}_loggedin') or {}
 	loggedout = cache.get(f'{SITE}_loggedout') or {}
 	timestamp = int(time.time())
@@ -58,15 +61,14 @@ def get_logged_in_user():
 			id = int(lo_user)
 			v = get_account(id, graceful=True)
 			if not v:
-				session.clear()
-				return None
+				session.pop("lo_user")
 			else:
 				nonce = session.get("login_nonce", 0)
 				if nonce < v.login_nonce or v.id != id:
-					session.clear()
-					return None
+					session.pop("lo_user")
+					v = None
 
-				if request.method != "GET":
+				if v and request.method != "GET":
 					submitted_key = request.values.get("formkey")
 					if not validate_formkey(v, submitted_key): abort(401)