From ac8fbae3c019540b0cd2a61e0eb16d1da532ff18 Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 23 Mar 2023 15:02:02 +0200 Subject: [PATCH] stop marsify and chud award from being mutually exclusive --- files/routes/awards.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/files/routes/awards.py b/files/routes/awards.py index 4149d4ad85..e3603d1f25 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -299,9 +299,6 @@ def award_thing(v, thing_type, id): if author.marseyawarded: abort(409, f"{safe_username} is under the effect of a conflicting award: Marsey award!") - if author.marsify: - abort(409, f"{safe_username} is under the effect of a conflicting award: Marsify award!") - if author.agendaposter == 1: abort(409, f"{safe_username} is already chudded permanently!") @@ -389,9 +386,6 @@ def award_thing(v, thing_type, id): author.verified = "Verified" badge_grant(user=author, badge_id=150) elif kind == 'marsify': - if author.agendaposter: - abort(409, f"{safe_username} is under the effect of a conflicting award: Chud award!") - if not author.marsify or author.marsify != 1: if author.marsify: author.marsify += 86400 else: author.marsify = int(time.time()) + 86400