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-22 00:25:14 +00:00
parent d0bbf9e9a9 610e1fbada
commit 0bac37981f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/routes/admin.py
View File

@ -211,7 +211,7 @@ def distribute(v, option_id):
pool = 0
for o in post.options:
if o.exclusive == 2: pool += o.upvotes
if o.exclusive > 2: pool += o.upvotes
pool *= 200
autojanny.coins -= pool
@ -857,7 +857,7 @@ def agendaposter(user_id, v):
g.db.add(user)
if days: note = f"for {days} days"
else: note = "permenantly"
else: note = "permanently"
ma = ModAction(
kind="agendaposter",

2
files/routes/awards.py
View File

@ -173,7 +173,7 @@ def award_thing(v, thing_type, id):
return {"error": "You can't use this award on yourself."}, 400
if kind == 'marsify' and author.marsify == 1:
return {"error": "User is already permenantly marsified!"}, 403
return {"error": "User is already permanently marsified!"}, 403
if v.id != author.id:
if author.deflector and v.deflector: