forked from rDrama/rDrama
remove the incentive for paypigs to enable perma-marsify to avoid ever getting chudded
parent
1ed722c3b2
commit
aee38394f8
|
@ -1083,9 +1083,6 @@ def chud(fullname, v):
|
||||||
if user.chud == 1:
|
if user.chud == 1:
|
||||||
abort(403, f"@{user.username} is already chudded permanently!")
|
abort(403, f"@{user.username} is already chudded permanently!")
|
||||||
|
|
||||||
if user.marsify:
|
|
||||||
abort(403, f"You can't chud someone while they're marsified!")
|
|
||||||
|
|
||||||
days = 0.0
|
days = 0.0
|
||||||
try:
|
try:
|
||||||
days = float(request.values.get("days"))
|
days = float(request.values.get("days"))
|
||||||
|
|
|
@ -361,9 +361,6 @@ def award_thing(v, thing_type, id):
|
||||||
if author.marseyawarded:
|
if author.marseyawarded:
|
||||||
abort(409, f"{safe_username} under the effect of a conflicting award: Marsey award!")
|
abort(409, f"{safe_username} under the effect of a conflicting award: Marsey award!")
|
||||||
|
|
||||||
if author.marsify:
|
|
||||||
abort(409, f"{safe_username} under the effect of a conflicting award: Marsify award!")
|
|
||||||
|
|
||||||
if author.owoify:
|
if author.owoify:
|
||||||
abort(409, f"{safe_username} under the effect of a conflicting award: OwOify award!")
|
abort(409, f"{safe_username} under the effect of a conflicting award: OwOify award!")
|
||||||
|
|
||||||
|
@ -516,7 +513,8 @@ def award_thing(v, thing_type, id):
|
||||||
if thing_type == 'comment' and not thing.author.deflector:
|
if thing_type == 'comment' and not thing.author.deflector:
|
||||||
body = thing.body
|
body = thing.body
|
||||||
body = owoify(body)
|
body = owoify(body)
|
||||||
if author.marsify: body = marsify(body)
|
if author.marsify and not author.chud:
|
||||||
|
body = marsify(body)
|
||||||
thing.body_html = sanitize(body, limit_pings=5, showmore=True)
|
thing.body_html = sanitize(body, limit_pings=5, showmore=True)
|
||||||
g.db.add(thing)
|
g.db.add(thing)
|
||||||
elif ("Edgy" in kind and kind == v.house) or kind == 'sharpen':
|
elif ("Edgy" in kind and kind == v.house) or kind == 'sharpen':
|
||||||
|
|
|
@ -240,7 +240,7 @@ def comment(v):
|
||||||
|
|
||||||
body_for_sanitize = body
|
body_for_sanitize = body
|
||||||
if v.owoify: body_for_sanitize = owoify(body_for_sanitize)
|
if v.owoify: body_for_sanitize = owoify(body_for_sanitize)
|
||||||
if v.marsify: body_for_sanitize = marsify(body_for_sanitize)
|
if v.marsify and not v.chud: body_for_sanitize = marsify(body_for_sanitize)
|
||||||
if v.sharpen: body_for_sanitize = sharpen(body_for_sanitize)
|
if v.sharpen: body_for_sanitize = sharpen(body_for_sanitize)
|
||||||
|
|
||||||
body_html = sanitize(body_for_sanitize, limit_pings=5, showmore=(not v.marseyawarded), count_emojis=not v.marsify)
|
body_html = sanitize(body_for_sanitize, limit_pings=5, showmore=(not v.marseyawarded), count_emojis=not v.marsify)
|
||||||
|
@ -630,7 +630,7 @@ def edit_comment(cid, v):
|
||||||
body_for_sanitize = body
|
body_for_sanitize = body
|
||||||
if v.owoify:
|
if v.owoify:
|
||||||
body_for_sanitize = owoify(body_for_sanitize)
|
body_for_sanitize = owoify(body_for_sanitize)
|
||||||
if v.marsify:
|
if v.marsify and not v.chud:
|
||||||
body_for_sanitize = marsify(body_for_sanitize)
|
body_for_sanitize = marsify(body_for_sanitize)
|
||||||
if v.sharpen:
|
if v.sharpen:
|
||||||
body_for_sanitize = sharpen(body_for_sanitize)
|
body_for_sanitize = sharpen(body_for_sanitize)
|
||||||
|
|
Loading…
Reference in New Issue