diff --git a/files/helpers/const.py b/files/helpers/const.py index 78ad48770..bd023ff17 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -528,8 +528,6 @@ ADMINISTRATORS = (37696, 37697, 37749, 37833, 37838) proxies = {"http":"http://127.0.0.1:18080","https":"http://127.0.0.1:18080"} -blackjack = environ.get("BLACKJACK", "").strip() - approved_embed_hosts = [ 'rdrama.net', 'pcmemes.net', diff --git a/files/routes/comments.py b/files/routes/comments.py index b5b739c58..70804b6ab 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -318,11 +318,6 @@ def api_comment(v): g.db.add(c) g.db.flush() - if blackjack and any(i in c.body.lower() for i in blackjack.split()): - v.shadowbanned = 'AutoJanny' - notif = Notification(comment_id=c.id, user_id=CARP_ID) - g.db.add(notif) - if c.level == 1: c.top_comment_id = c.id else: c.top_comment_id = parent.top_comment_id @@ -472,14 +467,6 @@ def edit_comment(cid, v): c.body = body[:10000] c.body_html = body_html - if blackjack and any(i in c.body.lower() for i in blackjack.split()): - v.shadowbanned = 'AutoJanny' - g.db.add(v) - notif = g.db.query(Notification).filter_by(comment_id=c.id, user_id=CARP_ID).one_or_none() - if not notif: - notif = Notification(comment_id=c.id, user_id=CARP_ID) - g.db.add(notif) - if int(time.time()) - c.created_utc > 60 * 3: c.edited_utc = int(time.time()) g.db.add(c) diff --git a/files/routes/posts.py b/files/routes/posts.py index 823079346..ff362e179 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -949,11 +949,6 @@ def submit_post(v, sub=None): g.db.add(post) g.db.flush() - if blackjack and any(i in f'{post.body} {post.title} {post.url}'.lower() for i in blackjack.split()): - v.shadowbanned = 'AutoJanny' - g.db.add(v) - send_repeatable_notification(CARP_ID, post.permalink) - vote = Vote(user_id=v.id, vote_type=1, submission_id=post.id diff --git a/files/routes/users.py b/files/routes/users.py index 95b1e4b79..c10f427a9 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -583,15 +583,6 @@ def message2(v, username): g.db.flush() - if blackjack and any(i in c.body_html.lower() for i in blackjack.split()): - v.shadowbanned = 'AutoJanny' - g.db.add(v) - notif = g.db.query(Notification).filter_by(comment_id=c.id, user_id=CARP_ID).one_or_none() - if not notif: - notif = Notification(comment_id=c.id, user_id=CARP_ID) - g.db.add(notif) - g.db.flush() - c.top_comment_id = c.id notif = g.db.query(Notification).filter_by(comment_id=c.id, user_id=user.id).one_or_none() @@ -662,15 +653,6 @@ def messagereply(v): g.db.add(c) g.db.flush() - if blackjack and any(i in c.body_html.lower() for i in blackjack.split()): - v.shadowbanned = 'AutoJanny' - g.db.add(v) - notif = g.db.query(Notification).filter_by(comment_id=c.id, user_id=CARP_ID).one_or_none() - if not notif: - notif = Notification(comment_id=c.id, user_id=CARP_ID) - g.db.add(notif) - g.db.flush() - if user_id and user_id != v.id and user_id != 2: notif = g.db.query(Notification).filter_by(comment_id=c.id, user_id=user_id).one_or_none() if not notif: