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

remove code that excluded me from deflector effect

master
Aevann1 2022-10-29 22:19:50 +02:00
parent 89b0807b2d
commit 5230e8e7f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/routes/awards.py
View File

@ -182,7 +182,7 @@ def award_thing(v, thing_type, id):
return {"message": f"{AWARDS[kind]['title']} award given to {thing_type} successfully!"}
if author.deflector and v.id != AEVANN_ID and (AWARDS[kind]['price'] > 500 or kind == 'marsify' or kind.istitle()) and kind not in ('pin','unpin','benefactor'):
if author.deflector and (AWARDS[kind]['price'] > 500 or kind == 'marsify' or kind.istitle()) and kind not in ('pin','unpin','benefactor'):
msg = f"@{v.username} has tried to give your [{thing_type}]({thing.shortlink}) the {AWARDS[kind]['title']} Award but it was deflected and applied to them :marseytroll:"
send_repeatable_notification(author.id, msg)
msg = f"{safe_username} is under the effect of a deflector award; your {AWARDS[kind]['title']} Award has been deflected back to you :marseytroll:"
@ -327,7 +327,7 @@ def award_thing(v, thing_type, id):
else: author.marsify = int(time.time()) + 21600
badge_grant(user=author, badge_id=170)
if thing_type == 'comment' and (not author.deflector or v.id == AEVANN_ID):
if thing_type == 'comment' and not author.deflector:
body = thing.body
if author.owoify: body = owoify(body)
body = marsify(body)
@ -353,7 +353,7 @@ def award_thing(v, thing_type, id):
else: author.owoify = int(time.time()) + 21600
badge_grant(user=author, badge_id=167)
if thing_type == 'comment' and not (author.deflector or v.id == AEVANN_ID):
if thing_type == 'comment' and not author.deflector:
body = thing.body
body = owoify(body)
if author.marsify: body = marsify(body)