move emails from /fp to check_for_alts
parent
8f3083a341
commit
520dc82cdd
|
@ -73,6 +73,14 @@ def check_for_alts(current, include_current_session=False):
|
||||||
|
|
||||||
past_accs = set(session.get("history", [])) if include_current_session else set()
|
past_accs = set(session.get("history", [])) if include_current_session else set()
|
||||||
|
|
||||||
|
if current.email and current.email_verified:
|
||||||
|
more_ids = [x[0] for x in g.db.query(User.id).filter(
|
||||||
|
User.email == current.email,
|
||||||
|
User.email_verified == True,
|
||||||
|
User.id != current.id,
|
||||||
|
).all()]
|
||||||
|
past_accs.extend(more_ids)
|
||||||
|
|
||||||
for past_id in list(past_accs):
|
for past_id in list(past_accs):
|
||||||
if past_id == current.id: continue
|
if past_id == current.id: continue
|
||||||
|
|
||||||
|
|
|
@ -1280,10 +1280,6 @@ def fp(v, fp):
|
||||||
|
|
||||||
v.fp = fp
|
v.fp = fp
|
||||||
users = g.db.query(User).filter(User.fp == fp, User.id != v.id).all()
|
users = g.db.query(User).filter(User.fp == fp, User.id != v.id).all()
|
||||||
if v.email and v.email_verified:
|
|
||||||
alts = g.db.query(User).filter(User.email == v.email, User.email_verified, User.id != v.id).all()
|
|
||||||
if alts:
|
|
||||||
users += alts
|
|
||||||
for u in users:
|
for u in users:
|
||||||
li = [v.id, u.id]
|
li = [v.id, u.id]
|
||||||
g.db.flush()
|
g.db.flush()
|
||||||
|
|
Loading…
Reference in New Issue