carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

stop marsify and chud award from being mutually exclusive

master
Aevann 2023-03-23 15:02:02 +02:00
parent 2e6acd4cc5
commit ac8fbae3c0
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/routes/awards.py
View File

@ -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