diff --git a/files/helpers/awards.py b/files/helpers/awards.py index a48e80b88..84d41f29f 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -65,18 +65,19 @@ def award_timers(v, bot=False): if v.owoify and v.owoify < now: v.owoify = None notify_if_not_bot("Your OwOify status has expired!") - v.house = v.old_house badge = v.has_badge(167) if v.bite and v.bite < now: v.bite = None - notify_if_not_bot("Your vampire status has ended!") - v.house = v.old_house + + if v.old_house: + notify_if_not_bot("Your vampire status has ended!") + v.house = v.old_house + badge = v.has_badge(168) if badge: g.db.delete(badge) if v.earlylife and v.earlylife < now: v.earlylife = None notify_if_not_bot("Your earlylife status has expired!") - v.house = v.old_house badge = v.has_badge(169) if v.marsify and v.marsify != 1 and v.marsify < now: v.marsify = 0 @@ -86,7 +87,6 @@ def award_timers(v, bot=False): if v.rainbow and v.rainbow < now: v.rainbow = None notify_if_not_bot("Your rainbow has expired!") - v.house = v.old_house badge = v.has_badge(171) g.db.add(v) diff --git a/files/routes/subs.py b/files/routes/subs.py index 91db4aa51..13ed232e2 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -545,7 +545,7 @@ def sub_stealth(v, sub): sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none() if not sub: abort(404) - if sub.name in ('smuggies','braincels'): abort(403) + if sub.name == 'braincels': abort(403) if not v.mods(sub.name): abort(403) sub.stealth = not sub.stealth