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

Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

master
Aevann1 2022-09-04 20:02:51 +00:00
parent f5b157707c 88e96988a9
commit 9d101e7841
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/helpers/awards.py
View File

@ -86,7 +86,7 @@ def award_timers(v, bot=False):
v.owoify = None v.owoify = None
notify_if_not_bot("Your owoify status has expired!") notify_if_not_bot("Your owoify status has expired!")
dirty = True dirty = True
if v.marsify and v.marsify < now: if v.marsify and v.marsify != 1 and v.marsify < now:
v.marsify = None v.marsify = None
if SITE_NAME != 'rDrama': notify_if_not_bot("Your marsify status has expired!") if SITE_NAME != 'rDrama': notify_if_not_bot("Your marsify status has expired!")
dirty = True dirty = True

7
files/routes/awards.py
View File

@ -167,6 +167,9 @@ def award_thing(v, thing_type, id):
if kind == "benefactor" and author.id == v.id: if kind == "benefactor" and author.id == v.id:
return {"error": "You can't use this award on yourself."}, 400 return {"error": "You can't use this award on yourself."}, 400
if (kind.startswith('Femboy') or kind == 'marsify') and author.marsify == 1:
return {"error": "User is already permenantly marsified!"}, 403
if v.id != author.id: if v.id != author.id:
if author.deflector and (AWARDS[kind]['price'] > 500 or kind.istitle()) and kind not in ('pin','unpin','benefactor'): if author.deflector and (AWARDS[kind]['price'] > 500 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:" 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:"
@ -353,7 +356,7 @@ def award_thing(v, thing_type, id):
if author.owoify: author.owoify += 21600 if author.owoify: author.owoify += 21600
else: author.owoify = int(time.time()) + 21600 else: author.owoify = int(time.time()) + 21600
if thing_type == 'comment': if thing_type == 'comment' and not author.deflector:
body = thing.body body = thing.body
body = owoify(body) body = owoify(body)
if author.marsify: body = marsify(body) if author.marsify: body = marsify(body)
@ -363,7 +366,7 @@ def award_thing(v, thing_type, id):
if author.marsify: author.marsify += 21600 if author.marsify: author.marsify += 21600
else: author.marsify = int(time.time()) + 21600 else: author.marsify = int(time.time()) + 21600
if thing_type == 'comment': if thing_type == 'comment' and not author.deflector:
body = thing.body body = thing.body
if author.owoify: body = owoify(body) if author.owoify: body = owoify(body)
body = marsify(body) body = marsify(body)