From e359bc008d585352b4cc882f71e175a4601bdda2 Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 24 Mar 2023 18:56:51 +0200 Subject: [PATCH] reorder some variables around --- files/helpers/awards.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/files/helpers/awards.py b/files/helpers/awards.py index 8d69c8bd3c..c497b1d25c 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -68,18 +68,14 @@ def award_timers(v, bot=False): badge = v.has_badge(167) if v.bite and v.bite < now: v.bite = None - - notif_text = "Your vampire status has ended." - - if "Vampire" not in v.old_house: - notif_text += f" You're now back in House {v.old_house.replace(' Founder', '')}!" - v.house = v.old_house - v.old_house = '' - - notify_if_not_bot(notif_text) - badge = v.has_badge(168) if badge: g.db.delete(badge) + + if "Vampire" not in v.old_house: + v.house = v.old_house + v.old_house = '' + notify_if_not_bot(f"Your vampire status has ended. You're now back in House {v.old_house.replace(' Founder', '')}!") + if v.earlylife and v.earlylife < now: v.earlylife = None notify_if_not_bot("Your earlylife status has expired!")