From aee38394f8854f554918a878ce1645f740ba2987 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 12 Aug 2023 21:38:41 +0300 Subject: [PATCH] remove the incentive for paypigs to enable perma-marsify to avoid ever getting chudded --- files/routes/admin.py | 3 --- files/routes/awards.py | 6 ++---- files/routes/comments.py | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index 9fa9210df..f9631ea6a 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -1083,9 +1083,6 @@ def chud(fullname, v): if user.chud == 1: abort(403, f"@{user.username} is already chudded permanently!") - if user.marsify: - abort(403, f"You can't chud someone while they're marsified!") - days = 0.0 try: days = float(request.values.get("days")) diff --git a/files/routes/awards.py b/files/routes/awards.py index 2447812e0..d976201fd 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -361,9 +361,6 @@ def award_thing(v, thing_type, id): if author.marseyawarded: abort(409, f"{safe_username} under the effect of a conflicting award: Marsey award!") - if author.marsify: - abort(409, f"{safe_username} under the effect of a conflicting award: Marsify award!") - if author.owoify: abort(409, f"{safe_username} under the effect of a conflicting award: OwOify award!") @@ -516,7 +513,8 @@ def award_thing(v, thing_type, id): if thing_type == 'comment' and not thing.author.deflector: body = thing.body body = owoify(body) - if author.marsify: body = marsify(body) + if author.marsify and not author.chud: + body = marsify(body) thing.body_html = sanitize(body, limit_pings=5, showmore=True) g.db.add(thing) elif ("Edgy" in kind and kind == v.house) or kind == 'sharpen': diff --git a/files/routes/comments.py b/files/routes/comments.py index 502490a99..245c4cdc9 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -240,7 +240,7 @@ def comment(v): body_for_sanitize = body if v.owoify: body_for_sanitize = owoify(body_for_sanitize) - if v.marsify: body_for_sanitize = marsify(body_for_sanitize) + if v.marsify and not v.chud: body_for_sanitize = marsify(body_for_sanitize) if v.sharpen: body_for_sanitize = sharpen(body_for_sanitize) body_html = sanitize(body_for_sanitize, limit_pings=5, showmore=(not v.marseyawarded), count_emojis=not v.marsify) @@ -630,7 +630,7 @@ def edit_comment(cid, v): body_for_sanitize = body if v.owoify: body_for_sanitize = owoify(body_for_sanitize) - if v.marsify: + if v.marsify and not v.chud: body_for_sanitize = marsify(body_for_sanitize) if v.sharpen: body_for_sanitize = sharpen(body_for_sanitize)