rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

fix conflict

pull/15/head
justcool393 2022-11-27 10:49:47 -06:00
parent 19a2a27793
commit 5ab4a8400c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/routes/wrappers.py
View File

@ -18,7 +18,10 @@ def session_init():
session["session_id"] = secrets.token_hex(49) session["session_id"] = secrets.token_hex(49)
def calc_users(v): 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 {} loggedin = cache.get(f'{SITE}_loggedin') or {}
loggedout = cache.get(f'{SITE}_loggedout') or {} loggedout = cache.get(f'{SITE}_loggedout') or {}
timestamp = int(time.time()) timestamp = int(time.time())
@ -58,15 +61,14 @@ def get_logged_in_user():
id = int(lo_user) id = int(lo_user)
v = get_account(id, graceful=True) v = get_account(id, graceful=True)
if not v: if not v:
session.clear() session.pop("lo_user")
return None
else: else:
nonce = session.get("login_nonce", 0) nonce = session.get("login_nonce", 0)
if nonce < v.login_nonce or v.id != id: if nonce < v.login_nonce or v.id != id:
session.clear() session.pop("lo_user")
return None v = None
if request.method != "GET": if v and request.method != "GET":
submitted_key = request.values.get("formkey") submitted_key = request.values.get("formkey")
if not validate_formkey(v, submitted_key): abort(401) if not validate_formkey(v, submitted_key): abort(401)