diff --git a/files/helpers/awards.py b/files/helpers/awards.py index 1fcb40871..aacab719e 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 != 1 and v.marsify < now: + if v.marsify and v.marsify < now: 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/settings.py b/files/routes/settings.py index b54a27c4c..544989ba6 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -100,14 +100,6 @@ def settings_profile_post(v): updated = True v.is_nofollow = request.values.get("nofollow") == 'true' - elif request.values.get("marsify", v.marsify) != v.marsify and v.marsify <= 1: - updated = True - v.marsify = int(request.values.get("marsify") == 'true') - if v.marsify: badge_grant(user=v, badge_id=170) - else: - badge = v.has_badge(170) - if badge: g.db.delete(badge) - elif request.values.get("spider", v.spider) != v.spider and v.spider <= 1: updated = True v.spider = int(request.values.get("spider") == 'true') diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index 986b7598b..5eb974351 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -742,24 +742,6 @@ - -
- -
- -
- -
- -
- 1 %}disabled{% endif %} onchange="post_toast(this,'/settings/profile?marsify='+document.getElementById('marsifyswitch').checked)"> - -
- - Automatically insert relevant marseys into your future comments. - -
-