carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

alts: only change session data if new include_current_session flag is set

master
justcool393 2022-11-01 16:58:42 -05:00
parent 1bf3d3abc3
commit 7d80483f67
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/routes/admin.py
View File

@ -744,8 +744,8 @@ def admin_link_accounts(v):
g.db.add(new_alt)
g.db.flush()
check_for_alts(g.db.get(User, u1))
check_for_alts(g.db.get(User, u2))
check_for_alts(g.db.get(User, u1), include_current_session=False)
check_for_alts(g.db.get(User, u2), include_current_session=False)
ma = ModAction(
kind="link_accounts",

7
files/routes/login.py
View File

@ -21,13 +21,13 @@ def login_get(v):
return render_template("login.html", failed=False, redirect=redir)
def check_for_alts(current:User):
def check_for_alts(current:User, include_current_session=True):
current_id = current.id
if current_id in (1691,6790,7069,36152):
if current_id in (1691,6790,7069,36152) and include_current_session:
session["history"] = []
return
ids = [x[0] for x in g.db.query(User.id).all()]
past_accs = set(session.get("history", []))
past_accs = set(session.get("history", [])) if include_current_session else set()
def add_alt(user1:int, user2:int):
li = [user1, user2]
@ -59,6 +59,7 @@ def check_for_alts(current:User):
add_alt(a.user2, current_id)
past_accs.add(current_id)
if include_current_session:
session["history"] = list(past_accs)
g.db.flush()
for u in current.alts_unique: