diff --git a/files/helpers/const.py b/files/helpers/const.py
index 20b54b876..6c2ea46e8 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -415,38 +415,27 @@ HOLE_REQUIRED = False
HOLE_COST = 0
HOLE_INACTIVITY_DELETION = False
+PRIVILEGED_USER_BOTS = ()
+GUMROAD_MESSY = ()
+
AUTOJANNY_ID = 1
SNAPPY_ID = 2
LONGPOSTBOT_ID = 3
ZOZBOT_ID = 4
BASEDBOT_ID = 0
-PRIVILEGED_USER_BOTS = ()
-
-SCHIZO_ID = 0
KIPPY_ID = 0
-MCCOX_ID = 0
-CHIOBU_ID = 0
PIZZASHILL_ID = 0
IMPASSIONATA_ID = 0
-HEYMOON_ID = 0
-MIMW_ID = 0
-SNUS_ID = 0
-GUMROAD_MESSY = ()
-IDIO_ID = 0
CARP_ID = 0
-JOAN_ID = 0
AEVANN_ID = 0
SNAKES_ID = 0
JUSTCOOL_ID = 0
-HOMO_ID = 0
-SOREN_ID = 0
LAWLZ_ID = 0
-DAD_ID = 0
-MOM_ID = 0
-DONGER_ID = 0
-GEESE_ID = 0
-BLACKJACKBTZ_ID = 0
+TGTW_ID = 0
+
MODMAIL_ID = 2
+GIFT_NOTIF_ID = 5
+SIGNUP_FOLLOW_ID = 0
POLL_THREAD = 0
POLL_BET_COINS = 200
@@ -461,8 +450,6 @@ SIDEBAR_THREAD = 0
BANNER_THREAD = 0
BADGE_THREAD = 0
SNAPPY_THREAD = 0
-GIFT_NOTIF_ID = 5
-SIGNUP_FOLLOW_ID = 0
NOTIFICATION_THREAD = 1
MAX_IMAGE_SIZE_BANNER_RESIZED_MB = 1
@@ -498,6 +485,8 @@ BADGE_BLACKLIST = { # only grantable by AEVANN_ID and SNAKES_ID except on PCM
137, # Lottery Winner
}
+NOTIFIED_USERS = {}
+
if SITE == 'rdrama.net':
FEATURES['PRONOUNS'] = True
FEATURES['HOUSES'] = True
@@ -520,36 +509,58 @@ if SITE == 'rdrama.net':
HOLE_COST = 50000
HOLE_INACTIVITY_DELETION = True
+ PRIVILEGED_USER_BOTS = (12125,16049)
+ GUMROAD_MESSY = (1230,1379)
+
AUTOJANNY_ID = 1046
SNAPPY_ID = 261
LONGPOSTBOT_ID = 1832
ZOZBOT_ID = 1833
- PRIVILEGED_USER_BOTS = (12125, 16049)
-
- SCHIZO_ID = 8494
KIPPY_ID = 7150
- MCCOX_ID = 8239
- CHIOBU_ID = 5214
PIZZASHILL_ID = 2424
IMPASSIONATA_ID = 5800
- HEYMOON_ID = 3635
- MIMW_ID = 3377
- SNUS_ID = 8407
- GUMROAD_MESSY = (1230,1379)
- IDIO_ID = 30
CARP_ID = 995
- JOAN_ID = 28
AEVANN_ID = 1
SNAKES_ID = 10288
JUSTCOOL_ID = 4999
- HOMO_ID = 147
- SOREN_ID = 2546
LAWLZ_ID = 3833
- DAD_ID = 2513
- MOM_ID = 4588
- DONGER_ID = 541
- GEESE_ID = 1710
- BLACKJACKBTZ_ID = 12732
+ TGTW_ID = 2008
+
+ NOTIFIED_USERS = {
+ 'aevan': AEVANN_ID,
+ 'avean': AEVANN_ID,
+ 'carp': CARP_ID,
+ 'clit': CARP_ID,
+ 'snakes': SNAKES_ID,
+ 'sneks': SNAKES_ID,
+ 'snekky': SNAKES_ID,
+ 'snekchad': SNAKES_ID,
+ 'jc': JUSTCOOL_ID,
+ 'justcool': JUSTCOOL_ID,
+ 'kippy': KIPPY_ID,
+ 'lawlz': LAWLZ_ID,
+ 'transgirltradwife': TGTW_ID,
+ 'impassionata': IMPASSIONATA_ID,
+ 'pizzashill': PIZZASHILL_ID,
+
+ 'joan': 28,
+ 'pewkie': 28,
+ 'idio3': 30,
+ 'idio ': 30,
+ 'telegram ': 30,
+ 'the_homocracy': 147,
+ 'donger': 541,
+ 'geese': 1710,
+ 'soren': 2546,
+ 'marseyismywaifu': 3377,
+ 'mimw': 3377,
+ 'heymoon': 3635,
+ 'jollymoon': 3635,
+ 'chiobu': 5214,
+ 'mccox': 8239,
+ 'snus': 8407,
+ 'schizo': 8494,
+ }
ANTISPAM_BYPASS_IDS = {1703, 13427}
@@ -1449,41 +1460,6 @@ TROLLTITLES = [
"Hey jannies can you please ban @{username}",
]
-NOTIFIED_USERS = {
- 'aevan': AEVANN_ID,
- 'avean': AEVANN_ID,
- 'joan': JOAN_ID,
- 'pewkie': JOAN_ID,
- 'carp': CARP_ID,
- 'idio3': IDIO_ID,
- 'idio ': IDIO_ID,
- 'telegram ': IDIO_ID,
- 'the_homocracy': HOMO_ID,
- 'schizo': SCHIZO_ID,
- 'snakes': SNAKES_ID,
- 'sneks': SNAKES_ID,
- 'snekky': SNAKES_ID,
- 'snekchad': SNAKES_ID,
- 'jc': JUSTCOOL_ID,
- 'justcool': JUSTCOOL_ID,
- 'geese': GEESE_ID,
- 'clit': CARP_ID,
- 'kippy': KIPPY_ID,
- 'mccox': MCCOX_ID,
-
- 'lawlz': LAWLZ_ID,
- 'chiobu': CHIOBU_ID,
- 'donger': DONGER_ID,
- 'soren': SOREN_ID,
- 'pizzashill': PIZZASHILL_ID,
- 'impassionata': IMPASSIONATA_ID,
- 'heymoon': HEYMOON_ID,
- 'jollymoon': HEYMOON_ID,
- 'marseyismywaifu': MIMW_ID,
- 'mimw': MIMW_ID,
- 'snus': SNUS_ID,
-}
-
FORTUNE_REPLIES = ('Your fortune: Allah Wills It','Your fortune: Inshallah, Only Good Things Shall Come To Pass','Your fortune: Allah Smiles At You This Day','Your fortune: Your Bussy Is In For A Blasting','Your fortune: You Will Be Propositioned By A High-Tier Twink','Your fortune: Repent, You Have Displeased Allah And His Vengeance Is Nigh','Your fortune: Reply Hazy, Try Again','Your fortune: lmao you just lost 100 coins','Your fortune: Yikes π¬','Your fortune: You Will Be Blessed With Many Black Bulls','Your fortune: NEETmax, The Day Is Lost If You Venture Outside','Your fortune: A Taste Of Jannah Awaits You Today','Your fortune: Watch Your Back','Your fortune: Outlook good','Your fortune: Godly Luck','Your fortune: Good Luck','Your fortune: Bad Luck','Your fortune: Good news will come to you by mail','Your fortune: Very Bad Luck','Your fortune: ο½·οΎββββββ(οΎβοΎ)ββββββ !!!!','Your fortune: Better not tell you now','Your fortune: You will meet a dark handsome stranger','Your fortune: οΌγΒ΄_γ`οΌοΎο½°οΎ','Your fortune: Excellent Luck','Your fortune: Average Luck')
FACTCHECK_REPLIES = ('Factcheck: This claim has been confirmed as correct by experts. ','Factcheck: This claim has been classified as misogynistic.','Factcheck: This claim is currently being debunked.','Factcheck: This claim is 100% true.','Factcheck: This claim hurts trans lives.','Factcheck: [REDACTED].','Factcheck: This claim is both true and false.','Factcheck: You really believe that shit? Lmao dumbass nigga π€£','Factcheck: None of this is real.','Factcheck: Yes.','Factcheck: This claim has not been approved by experts.','Factcheck: This claim is a gross exageration of reality.','Factcheck: WARNING! THIS CLAIM HAS BEEN CLASSIFIED AS DANGEROUS. PLEASE REMAIN STILL, AN AGENT WILL COME TO MEET YOU SHORTLY.')
EIGHTBALL_REPLIES = ('The 8-Ball Says: It is certain.', 'The 8-Ball Says: It is decidedly so.', 'The 8-Ball Says: Without a doubt.', 'The 8-Ball Says: Yes definitely.', 'The 8-Ball Says: You may rely on it.', 'The 8-Ball Says: As I see it, yes.', 'The 8-Ball Says: Most likely.', 'The 8-Ball Says: Outlook good.', 'The 8-Ball Says: Yes.', 'The 8-Ball Says: Signs point to yes.', 'The 8-Ball Says: Reply hazy, try again.', 'The 8-Ball Says: Ask again later.', 'The 8-Ball Says: Better not tell you now.', 'The 8-Ball Says: Cannot predict now.', 'The 8-Ball Says: Concentrate and ask again.', 'The 8-Ball Says: Don\'t count on it.', 'The 8-Ball Says: My reply is no.', 'The 8-Ball Says: My sources say no.', 'The 8-Ball Says: Outlook not so good.', 'The 8-Ball Says: Very doubtful.')
diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py
index 633e579ff..3f2c9c46e 100644
--- a/files/routes/asset_submissions.py
+++ b/files/routes/asset_submissions.py
@@ -14,7 +14,7 @@ from files.__main__ import app, cache, limiter
ASSET_TYPES = (Marsey, HatDef)
CAN_APPROVE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID)
-CAN_UPDATE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID, GEESE_ID, JUSTCOOL_ID)
+CAN_UPDATE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID)
@app.get("/submit/marseys")
@auth_required
diff --git a/files/routes/posts.py b/files/routes/posts.py
index d5c263220..0fe1a55cb 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -805,7 +805,7 @@ def submit_post(v:User, sub=None):
execute_lawlz_actions(v, post)
if (SITE == 'rdrama.net'
- and v.id in (IMPASSIONATA_ID, PIZZASHILL_ID, 2008)
+ and v.id in (IMPASSIONATA_ID, PIZZASHILL_ID, TGTW_ID)
and not (post.sub and post.subr.stealth)):
post.stickied_utc = int(time.time()) + 3600
post.stickied = "AutoJanny"
diff --git a/files/routes/routehelpers.py b/files/routes/routehelpers.py
index a4077aec6..0848d7917 100644
--- a/files/routes/routehelpers.py
+++ b/files/routes/routehelpers.py
@@ -46,7 +46,6 @@ def check_for_alts(current:User, include_current_session=True):
past_accs.remove(past_id)
continue
- if past_id == MOM_ID or current_id == MOM_ID: break
if past_id == current_id: continue
li = [past_id, current_id]
diff --git a/files/routes/settings.py b/files/routes/settings.py
index fd22453a3..6ccf86b5c 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -342,9 +342,6 @@ def settings_personal_post(v):
if house == "None": house = ''
v.house = house
- if v.house == "Vampire":
- send_repeatable_notification(DAD_ID, f"@{v.username} has joined House Vampire!")
-
updated = True
if updated:
diff --git a/files/routes/users.py b/files/routes/users.py
index d0e2c5786..578dda626 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -471,13 +471,13 @@ def message2(v:User, username:str):
body_html = sanitize(message)
- if not (SITE == 'rdrama.net' and user.id == BLACKJACKBTZ_ID):
- existing = g.db.query(Comment.id).filter(Comment.author_id == v.id,
- Comment.sentto == user.id,
- Comment.body_html == body_html,
- ).first()
+ existing = g.db.query(Comment.id).filter(
+ Comment.author_id == v.id,
+ Comment.sentto == user.id,
+ Comment.body_html == body_html
+ ).first()
- if existing: abort(403, "Message already exists.")
+ if existing: abort(403, "Message already exists.")
c = Comment(author_id=v.id,
parent_submission=None,