forked from rDrama/rDrama
Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost
commit
0bac37981f
|
@ -211,7 +211,7 @@ def distribute(v, option_id):
|
||||||
|
|
||||||
pool = 0
|
pool = 0
|
||||||
for o in post.options:
|
for o in post.options:
|
||||||
if o.exclusive == 2: pool += o.upvotes
|
if o.exclusive > 2: pool += o.upvotes
|
||||||
pool *= 200
|
pool *= 200
|
||||||
|
|
||||||
autojanny.coins -= pool
|
autojanny.coins -= pool
|
||||||
|
@ -857,7 +857,7 @@ def agendaposter(user_id, v):
|
||||||
g.db.add(user)
|
g.db.add(user)
|
||||||
|
|
||||||
if days: note = f"for {days} days"
|
if days: note = f"for {days} days"
|
||||||
else: note = "permenantly"
|
else: note = "permanently"
|
||||||
|
|
||||||
ma = ModAction(
|
ma = ModAction(
|
||||||
kind="agendaposter",
|
kind="agendaposter",
|
||||||
|
|
|
@ -173,7 +173,7 @@ def award_thing(v, thing_type, 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 == 'marsify' and author.marsify == 1:
|
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 v.id != author.id:
|
||||||
if author.deflector and v.deflector:
|
if author.deflector and v.deflector:
|
||||||
|
|
Loading…
Reference in New Issue