diff --git a/files/assets/images/Deuxrama/alert.webp b/files/assets/images/Deuxrama/alert.webp deleted file mode 100644 index 48057d4b4..000000000 Binary files a/files/assets/images/Deuxrama/alert.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/banner.webp b/files/assets/images/Deuxrama/banner.webp deleted file mode 100644 index 0fd98f3c1..000000000 Binary files a/files/assets/images/Deuxrama/banner.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/coins.webp b/files/assets/images/Deuxrama/coins.webp deleted file mode 100644 index b57f5ba8b..000000000 Binary files a/files/assets/images/Deuxrama/coins.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/cover.webp b/files/assets/images/Deuxrama/cover.webp deleted file mode 100644 index 5941441b9..000000000 Binary files a/files/assets/images/Deuxrama/cover.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/default_text.webp b/files/assets/images/Deuxrama/default_text.webp deleted file mode 100644 index eb2b5d1df..000000000 Binary files a/files/assets/images/Deuxrama/default_text.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/headericon.webp b/files/assets/images/Deuxrama/headericon.webp deleted file mode 100644 index 48057d4b4..000000000 Binary files a/files/assets/images/Deuxrama/headericon.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/icon.webp b/files/assets/images/Deuxrama/icon.webp deleted file mode 100644 index 48057d4b4..000000000 Binary files a/files/assets/images/Deuxrama/icon.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/lottery.webp b/files/assets/images/Deuxrama/lottery.webp deleted file mode 100644 index b2250b454..000000000 Binary files a/files/assets/images/Deuxrama/lottery.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/sidebar/1.webp b/files/assets/images/Deuxrama/sidebar/1.webp deleted file mode 100644 index 23daa80e6..000000000 Binary files a/files/assets/images/Deuxrama/sidebar/1.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/sidebar/2.webp b/files/assets/images/Deuxrama/sidebar/2.webp deleted file mode 100644 index e89833c58..000000000 Binary files a/files/assets/images/Deuxrama/sidebar/2.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/sidebar/3.webp b/files/assets/images/Deuxrama/sidebar/3.webp deleted file mode 100644 index d1ca451a8..000000000 Binary files a/files/assets/images/Deuxrama/sidebar/3.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/sidebar/4.webp b/files/assets/images/Deuxrama/sidebar/4.webp deleted file mode 100644 index 7af5e04d0..000000000 Binary files a/files/assets/images/Deuxrama/sidebar/4.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/sidebar/5.webp b/files/assets/images/Deuxrama/sidebar/5.webp deleted file mode 100644 index d737937c0..000000000 Binary files a/files/assets/images/Deuxrama/sidebar/5.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/sidebar/6.webp b/files/assets/images/Deuxrama/sidebar/6.webp deleted file mode 100644 index e79f1625a..000000000 Binary files a/files/assets/images/Deuxrama/sidebar/6.webp and /dev/null differ diff --git a/files/assets/images/Deuxrama/site_preview.webp b/files/assets/images/Deuxrama/site_preview.webp deleted file mode 100644 index 0fd98f3c1..000000000 Binary files a/files/assets/images/Deuxrama/site_preview.webp and /dev/null differ diff --git a/files/helpers/const.py b/files/helpers/const.py index d06b44532..abf8f0e8e 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -126,10 +126,7 @@ single_words = "|".join([slur.lower() for slur in SLURS.keys()]) LONGPOST_REPLIES = ('Wow, you must be a JP fan.', 'This is one of the worst posts I have EVER seen. Delete it.', "No, don't reply like this, please do another wall of unhinged rant please.", '

😴😴😴

', "Ma'am we've been over this before. You need to stop.", "I've known more coherent downies.", "Your pulitzer's in the mail", "That's great and all, but I asked for my burger without cheese.", 'That degree finally paying off', "That's nice sweaty. Why don't you have a seat in the time out corner with Pizzashill until you calm down, then you can have your Capri Sun.", "All them words won't bring your pa back.", "You had a chance to not be completely worthless, but it looks like you threw it away. At least you're consistent.", 'Some people are able to display their intelligence by going on at length on a subject and never actually saying anything. This ability is most common in trades such as politics, public relations, and law. You have impressed me by being able to best them all, while still coming off as an absolute idiot.', "You can type 10,000 characters and you decided that these were the one's that you wanted.", 'Have you owned the libs yet?', "I don't know what you said, because I've seen another human naked.", 'Impressive. Normally people with such severe developmental disabilities struggle to write much more than a sentence or two. He really has exceded our expectations for the writing portion. Sadly the coherency of his writing, along with his abilities in the social skills and reading portions, are far behind his peers with similar disabilities.', "This is a really long way of saying you don't fuck.", "Sorry ma'am, looks like his delusions have gotten worse. We'll have to admit him.", 'If only you could put that energy into your relationships', 'Posts like this is why I do Heroine.', 'still unemployed then?', 'K', 'look im gunna have 2 ask u 2 keep ur giant dumps in the toilet not in my replys 😷😷😷', "Mommy is soooo proud of you, sweaty. Let's put this sperg out up on the fridge with all your other failures.", "Good job bobby, here's a star", "That was a mistake. You're about to find out the hard way why.", f'You sat down and wrote all this shit. You could have done so many other things with your life. What happened to your life that made you decide writing novels of bullshit here was the best option?', "I don't have enough spoons to read this shit", "All those words won't bring daddy back.", 'OUT!', "Damn, you're really mad over this, but thanks for the effort you put into typing that all out! Sadly I won't read it all.", "Jesse what the fuck are you talking about??", "▼you're fucking bananas if you think I'm reading all that, take my downvote and shut up idiot", "Are you feeling okay bud?", ':#marseywoah:') -if SITE_NAME == 'Deuxrama': - AGENDAPOSTER_PHRASE = 'there are only two genders' -else: - AGENDAPOSTER_PHRASE = 'trans lives matter' +AGENDAPOSTER_PHRASE = 'trans lives matter' AGENDAPOSTER_MSG = """Hi @{username},\n\nYour {type} has been automatically removed because you forgot to include `{AGENDAPOSTER_PHRASE}`.\n\nDon't worry, we're here to help! We won't let you post or comment anything that doesn't express your love and acceptance towards the trans community. Feel free to resubmit your {type} with `{AGENDAPOSTER_PHRASE}` included. \n\n*This is an automated message; if you need help, you can message us [here](/contact).*""" @@ -249,16 +246,7 @@ if SITE in ('rdrama.net', 'devrama.xyz'): SNAPPY_THREAD = 37749 MARSEY_THREAD = 37838 GAMBLING_THREAD = 39413 -elif SITE == 'deuxrama.net': - PERMS['HOLE_CREATE'] = 3 - PERMS['CONTENT_THREADS'] = 2 - - FEATURES['PROCOINS'] = False - - SIDEBAR_THREAD = 175 - BADGE_THREAD = 142 - -if SITE in {'rdrama.net', 'devrama.xyz', 'deuxrama.net'}: +if SITE in {'rdrama.net', 'devrama.xyz'}: HOLE_COST = 50000 HOLE_INACTIVITY_DELETION = True @@ -930,8 +918,7 @@ SNAPPY_QUOTES = [] if not SITE_NAME in ['PCM', 'LGBDropTheT']: SNAPPY_QUOTES = [f':#{x}:' for x in marseys_const2] -if SITE_NAME == 'Deuxrama': snappy_name = 'rDrama' -else: snappy_name = SITE_NAME +snappy_name = SITE_NAME if path.isfile(f'snappy_{snappy_name}.txt'): with open(f'snappy_{snappy_name}.txt', "r", encoding="utf-8") as f: @@ -953,7 +940,6 @@ approved_embed_hosts = { 'devrama.xyz', 'lgbdropthet.com', 'chudrama.net', - 'deuxrama.net', 'imgur.com', 'lain.la', 'pngfind.com', diff --git a/files/routes/login.py b/files/routes/login.py index c1383f0ab..4169d122e 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -157,69 +157,6 @@ def on_login(account, redir=None): check_for_alts(account.id) -@app.get("/loginshared/auth/") -@auth_required -def loginshared_authenticate(v, site_for): - # Despite providing an interface for general site_for for forward-compat, - # loginshared_* is only designed at present for login on Deux using rDrama. - if not (SITE == 'rdrama.net' and site_for == 'deuxrama.net'): - abort(403) - - # Kludge to prevent accounts created after the DB seeding (on either site) - # from being improperly logged into. The only account matching we have is - # based on user_id, which isn't guaranteed identical post-seeding. - if v.id > 12335: - abort(500) - - token = loginshared_secret_token(site_for, v.id) - - # Must be https! Downgrading security leaks secrets in query string. - redirect_url = f'https://deuxrama.net/loginshared/verify/' \ - + f'rdrama.net/{v.id}/{token}' - return redirect(redirect_url) - -@app.get("/loginshared/secret//") -@auth_trusted_server -def loginshared_secret(site_for, user_id): - if not (SITE == 'rdrama.net' and site_for == 'deuxrama.net'): - abort(403) - - return loginshared_secret_token(site_for, user_id) - -def loginshared_secret_token(site_for, user_id): - cache_key = f'loginshared_secret_token:{site_for}:{user_id}' - - token = cache.get(cache_key) - if token is None: - token = secrets.token_urlsafe(32) - cache.set(cache_key, token, timeout=15) - - return token - -@app.get("/loginshared/verify///") -def loginshared_verify(site_from, user_id, token): - if not TRUSTED_SERVER_PSK: - abort(403) - if not (SITE == 'deuxrama.net' and site_from == 'rdrama.net'): - abort(403) - - provider_url = f'https://rdrama.net/loginshared/secret/deuxrama.net/{user_id}' - provider_auth = f'TrustedServer {TRUSTED_SERVER_PSK}' - provider_resp = requests.get(provider_url, - headers={'Authorization': provider_auth}, - timeout=5) - if provider_resp.status_code != 200: - abort(500) - - if provider_resp.text != token: - time.sleep(random.uniform(0, 2)) - return render_template("login.html", failed=True) - - account = get_account(user_id) - on_login(account) - - return redirect('/') - @app.get("/me") @app.get("/@me") @auth_required diff --git a/files/routes/static.py b/files/routes/static.py index d04f63dad..445dd676b 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -19,7 +19,7 @@ def rdrama(id, title): @app.get("/marseys") @auth_required def marseys(v): - if SITE in ('rdrama.net','devrama.xyz','deuxrama.net'): + if SITE in ('rdrama.net','devrama.xyz'): marseys = g.db.query(Marsey, User).join(User) sort = request.values.get("sort", "usage") if sort == "usage": marseys = marseys.order_by(Marsey.count.desc(), User.username) @@ -37,7 +37,7 @@ def marsey_list(): if EMOJI_MARSEYS: emojis = [{ "name": emoji.name, - "author": author if SITE in ('rdrama.net','devrama.xyz','deuxrama.net') or author == "anton-d" else None, + "author": author if SITE in ('rdrama.net','devrama.xyz') or author == "anton-d" else None, # yikes, I don't really like this DB schema. Next time be better "tags": emoji.tags.split(" ") + [emoji.name[len("marsey"):] \ if emoji.name.startswith("marsey") else emoji.name], diff --git a/files/templates/header.html b/files/templates/header.html index 9c58da980..6cc0b23e3 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -70,7 +70,7 @@ {% if sub %} - {% if not HOLE_STYLE_FLAIR %}/h/{% endif %}{{sub.name}} + {% if not HOLE_STYLE_FLAIR %}/h/{% endif %}{{sub.name}} {% elif has_logo %}