From d88d5ad453c8bd2f52883dc61c067031082d5b99 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 4 Sep 2022 21:06:26 +0200 Subject: [PATCH 1/2] add logic for permarsify --- files/helpers/awards.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/helpers/awards.py b/files/helpers/awards.py index e07f8a1d3..1ec9ff65a 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -86,7 +86,7 @@ def award_timers(v, bot=False): v.owoify = None notify_if_not_bot("Your owoify status has expired!") dirty = True - if v.marsify and v.marsify < now: + if v.marsify and v.marsify != 1 and v.marsify < now: v.marsify = None if SITE_NAME != 'rDrama': notify_if_not_bot("Your marsify status has expired!") dirty = True From 88e96988a91a43b76357c2994e6e342d30e4159e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 4 Sep 2022 21:43:02 +0200 Subject: [PATCH 2/2] more marsify/owoify shit --- files/routes/awards.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/files/routes/awards.py b/files/routes/awards.py index fde9b8d36..df9cbed79 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -167,6 +167,9 @@ def award_thing(v, thing_type, id): if kind == "benefactor" and author.id == v.id: return {"error": "You can't use this award on yourself."}, 400 + if (kind.startswith('Femboy') or kind == 'marsify') and author.marsify == 1: + return {"error": "User is already permenantly marsified!"}, 403 + if v.id != author.id: if author.deflector and (AWARDS[kind]['price'] > 500 or kind.istitle()) and kind not in ('pin','unpin','benefactor'): msg = f"@{v.username} has tried to give your [{thing_type}]({thing.shortlink}) the {AWARDS[kind]['title']} Award but it was deflected and applied to them :marseytroll:" @@ -353,7 +356,7 @@ def award_thing(v, thing_type, id): if author.owoify: author.owoify += 21600 else: author.owoify = int(time.time()) + 21600 - if thing_type == 'comment': + if thing_type == 'comment' and not author.deflector: body = thing.body body = owoify(body) if author.marsify: body = marsify(body) @@ -363,7 +366,7 @@ def award_thing(v, thing_type, id): if author.marsify: author.marsify += 21600 else: author.marsify = int(time.time()) + 21600 - if thing_type == 'comment': + if thing_type == 'comment' and not author.deflector: body = thing.body if author.owoify: body = owoify(body) body = marsify(body)