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

make chud award work with hieroglyphs award

master
Aevann 2023-10-13 22:02:40 +03:00
parent 9db8bdcd67
commit 42216dbc99
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

@ -363,9 +363,6 @@ def award_thing(v, thing_type, id):
or thing_type == 'comment' and thing.post and thing.post.hole == 'chudrama': or thing_type == 'comment' and thing.post and thing.post.hole == 'chudrama':
abort(403, "You can't give the chud award in /h/chudrama") abort(403, "You can't give the chud award in /h/chudrama")
if author.marseyawarded:
abort(409, f"{safe_username} under the effect of a conflicting award: Marsey award!")
if author.chud == 1: if author.chud == 1:
abort(409, f"{safe_username} already chudded permanently!") abort(409, f"{safe_username} already chudded permanently!")
@ -418,9 +415,6 @@ def award_thing(v, thing_type, id):
elif kind == "unpausable": elif kind == "unpausable":
badge_grant(badge_id=67, user=author) badge_grant(badge_id=67, user=author)
elif kind == "marsey": elif kind == "marsey":
if author.chud:
abort(409, f"{safe_username} under the effect of a conflicting award: Chud award!")
if author.marseyawarded: author.marseyawarded += 86400 if author.marseyawarded: author.marseyawarded += 86400
else: author.marseyawarded = int(time.time()) + 86400 else: author.marseyawarded = int(time.time()) + 86400
badge_grant(user=author, badge_id=98) badge_grant(user=author, badge_id=98)