forked from rDrama/rDrama
remove DONT_LINK_ALTS in favor of DONT_SHADOWBAN
parent
697e7d60b0
commit
837000505f
|
@ -495,7 +495,7 @@ BADGE_BLACKLIST = { # only grantable by AEVANN_ID and SNAKES_ID
|
||||||
}
|
}
|
||||||
|
|
||||||
NOTIFIED_USERS = {}
|
NOTIFIED_USERS = {}
|
||||||
DONT_LINK_ALTS = {}
|
DONT_SHADOWBAN = {}
|
||||||
|
|
||||||
if SITE == 'rdrama.net':
|
if SITE == 'rdrama.net':
|
||||||
FEATURES['PRONOUNS'] = True
|
FEATURES['PRONOUNS'] = True
|
||||||
|
@ -572,7 +572,7 @@ if SITE == 'rdrama.net':
|
||||||
|
|
||||||
ANTISPAM_BYPASS_IDS = {1703, 13427}
|
ANTISPAM_BYPASS_IDS = {1703, 13427}
|
||||||
|
|
||||||
DONT_LINK_ALTS = {253,3161,11163}
|
DONT_SHADOWBAN = {253,3161,11163}
|
||||||
|
|
||||||
BOOSTED_HOLES = {
|
BOOSTED_HOLES = {
|
||||||
'furry',
|
'furry',
|
||||||
|
|
|
@ -34,7 +34,6 @@ def check_for_alts(current:User, include_current_session=True):
|
||||||
past_accs = set(session.get("history", [])) if include_current_session else set()
|
past_accs = set(session.get("history", [])) if include_current_session else set()
|
||||||
|
|
||||||
def add_alt(user1:int, user2:int):
|
def add_alt(user1:int, user2:int):
|
||||||
if SITE == 'rdrama.net' and (user1 in DONT_LINK_ALTS or user2 in DONT_LINK_ALTS): return
|
|
||||||
li = [user1, user2]
|
li = [user1, user2]
|
||||||
existing = g.db.query(Alt).filter(Alt.user1.in_(li), Alt.user2.in_(li)).one_or_none()
|
existing = g.db.query(Alt).filter(Alt.user1.in_(li), Alt.user2.in_(li)).one_or_none()
|
||||||
if not existing:
|
if not existing:
|
||||||
|
@ -71,11 +70,11 @@ def check_for_alts(current:User, include_current_session=True):
|
||||||
g.db.flush()
|
g.db.flush()
|
||||||
for u in current.alts_unique:
|
for u in current.alts_unique:
|
||||||
if u._alt_deleted: continue
|
if u._alt_deleted: continue
|
||||||
if u.shadowbanned:
|
if u.shadowbanned and current.id not in DONT_SHADOWBAN:
|
||||||
current.shadowbanned = u.shadowbanned
|
current.shadowbanned = u.shadowbanned
|
||||||
current.ban_reason = u.ban_reason
|
current.ban_reason = u.ban_reason
|
||||||
g.db.add(current)
|
g.db.add(current)
|
||||||
elif current.shadowbanned:
|
elif current.shadowbanned and u.id not in DONT_SHADOWBAN:
|
||||||
u.shadowbanned = current.shadowbanned
|
u.shadowbanned = current.shadowbanned
|
||||||
u.ban_reason = current.ban_reason
|
u.ban_reason = current.ban_reason
|
||||||
g.db.add(u)
|
g.db.add(u)
|
||||||
|
|
|
@ -1156,9 +1156,6 @@ def subscribed_posts(v:User, username):
|
||||||
@app.post("/fp/<fp>")
|
@app.post("/fp/<fp>")
|
||||||
@auth_required
|
@auth_required
|
||||||
def fp(v:User, fp):
|
def fp(v:User, fp):
|
||||||
if SITE == 'rdrama.net' and v.id in DONT_LINK_ALTS:
|
|
||||||
return '', 204
|
|
||||||
|
|
||||||
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 users: print(f'{v.username}: fp', flush=True)
|
if users: print(f'{v.username}: fp', flush=True)
|
||||||
|
@ -1168,7 +1165,6 @@ def fp(v:User, fp):
|
||||||
print(f'{v.username}: email', flush=True)
|
print(f'{v.username}: email', flush=True)
|
||||||
users += alts
|
users += alts
|
||||||
for u in users:
|
for u in users:
|
||||||
if SITE == 'rdrama.net' and u.id in DONT_LINK_ALTS: continue
|
|
||||||
li = [v.id, u.id]
|
li = [v.id, u.id]
|
||||||
existing = g.db.query(Alt).filter(Alt.user1.in_(li), Alt.user2.in_(li)).one_or_none()
|
existing = g.db.query(Alt).filter(Alt.user1.in_(li), Alt.user2.in_(li)).one_or_none()
|
||||||
if existing: continue
|
if existing: continue
|
||||||
|
|
Loading…
Reference in New Issue