From 0b416dcf2cb76320e473b3461d74260e4c8a4a5b Mon Sep 17 00:00:00 2001 From: TLSM Date: Mon, 26 Sep 2022 02:08:54 -0400 Subject: [PATCH] Revise marsify logic. --- files/helpers/awards.py | 2 +- files/routes/awards.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/files/helpers/awards.py b/files/helpers/awards.py index aacab719e..e82a256b9 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -78,7 +78,7 @@ def award_timers(v, bot=False): v.earlylife = None notify_if_not_bot("Your earlylife status has expired!") badge = v.has_badge(169) - if v.marsify and v.marsify < now: + if v.marsify and v.marsify < now and v.marsify != 1: v.marsify = 0 if SITE_NAME != 'rDrama': notify_if_not_bot("Your marsify status has expired!") badge = v.has_badge(170) diff --git a/files/routes/awards.py b/files/routes/awards.py index 5c3b9873f..e2fa12dbb 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -382,8 +382,9 @@ def award_thing(v, thing_type, id): author.verified = "Verified" badge_grant(user=author, badge_id=150) elif kind == 'marsify': - if author.marsify: author.marsify += 21600 - else: author.marsify = int(time.time()) + 21600 + if not author.marsify or author.marsify != 1: + if author.marsify: author.marsify += 21600 + else: author.marsify = int(time.time()) + 21600 badge_grant(user=author, badge_id=170) if thing_type == 'comment' and (not author.deflector or v.id == AEVANN_ID):