const: rename constants from LIMIT to MINIMUM

the new name is much much clearer
pull/24/head
justcool393 2022-11-26 14:20:30 -06:00 committed by geese_suck
parent 37874b2e7d
commit 182c16f8a3
Signed by: geese_suck
GPG Key ID: 4D09E4B0A7264746
9 changed files with 18 additions and 18 deletions

View File

@ -1032,10 +1032,10 @@ class User(Base):
@property @property
@lazy @lazy
def can_post_in_ghost_threads(self): def can_post_in_ghost_threads(self):
if not TRUESCORE_GHOST_LIMIT: return True if not TRUESCORE_GHOST_MINIMUM: return True
if self.admin_level >= PERMS['POST_IN_GHOST_THREADS']: return True if self.admin_level >= PERMS['POST_IN_GHOST_THREADS']: return True
if self.club_allowed: return True if self.club_allowed: return True
if self.truescore >= TRUESCORE_GHOST_LIMIT: return True if self.truescore >= TRUESCORE_GHOST_MINIMUM: return True
if self.patron: return True if self.patron: return True
return False return False

View File

@ -388,10 +388,10 @@ COMMENT_MAX_DEPTH = 200
TRANSFER_MESSAGE_LENGTH_LIMIT = 200 # do not make larger than 10000 characters (comment limit) without altering the table TRANSFER_MESSAGE_LENGTH_LIMIT = 200 # do not make larger than 10000 characters (comment limit) without altering the table
MIN_REPOST_CHECK_URL_LENGTH = 9 # also change the constant in checkRepost() of submit.js MIN_REPOST_CHECK_URL_LENGTH = 9 # also change the constant in checkRepost() of submit.js
CHAT_LENGTH_LIMIT = 1000 CHAT_LENGTH_LIMIT = 1000
TRUESCORE_DONATE_LIMIT = 100
COSMETIC_AWARD_COIN_AWARD_PCT = 0.10 COSMETIC_AWARD_COIN_AWARD_PCT = 0.10
TRUESCORE_CHAT_LIMIT = 0 TRUESCORE_CHAT_MINIMUM = 0
TRUESCORE_GHOST_LIMIT = 0 TRUESCORE_DONATE_MINIMUM = 100
TRUESCORE_GHOST_MINIMUM = 0
LOGGEDIN_ACTIVE_TIME = 15 * 60 LOGGEDIN_ACTIVE_TIME = 15 * 60
PFP_DEFAULT_MARSEY = True PFP_DEFAULT_MARSEY = True
@ -494,8 +494,8 @@ if SITE == 'rdrama.net':
NOTIFICATION_THREAD = 6489 NOTIFICATION_THREAD = 6489
CHAT_LENGTH_LIMIT = 200 CHAT_LENGTH_LIMIT = 200
TRUESCORE_CHAT_LIMIT = 10 TRUESCORE_CHAT_MINIMUM = 10
TRUESCORE_GHOST_LIMIT = 10 TRUESCORE_GHOST_MINIMUM = 10
NEW_USER_HAT_AGE = 7 * 86400 NEW_USER_HAT_AGE = 7 * 86400
HOLE_COST = 50000 HOLE_COST = 50000
@ -629,8 +629,8 @@ elif SITE == 'watchpeopledie.tv':
SIDEBAR_THREAD = 5403 SIDEBAR_THREAD = 5403
BANNER_THREAD = 9869 BANNER_THREAD = 9869
TRUESCORE_CHAT_LIMIT = 10 TRUESCORE_CHAT_MINIMUM = 10
TRUESCORE_GHOST_LIMIT = 10 TRUESCORE_GHOST_MINIMUM = 10
HOLE_NAME = 'flair' HOLE_NAME = 'flair'
HOLE_STYLE_FLAIR = True HOLE_STYLE_FLAIR = True

View File

@ -39,8 +39,8 @@ user_ids_to_socket_ids = {}
@app.get("/chat") @app.get("/chat")
@is_not_permabanned @is_not_permabanned
def chat(v): def chat(v):
if TRUESCORE_CHAT_LIMIT and v.truescore < TRUESCORE_CHAT_LIMIT and not v.club_allowed: if TRUESCORE_CHAT_MINIMUM and v.truescore < TRUESCORE_CHAT_MINIMUM and not v.club_allowed:
abort(403, f"Need at least {TRUESCORE_CHAT_LIMIT} truescore for access to chat.") abort(403, f"Need at least {TRUESCORE_CHAT_MINIMUM} truescore for access to chat.")
return render_template("chat.html", v=v, messages=messages) return render_template("chat.html", v=v, messages=messages)
@ -50,7 +50,7 @@ def chat(v):
@ratelimit_user("3/second;10/minute") @ratelimit_user("3/second;10/minute")
def speak(data, v): def speak(data, v):
if v.is_banned: return '', 403 if v.is_banned: return '', 403
if TRUESCORE_CHAT_LIMIT and v.truescore < TRUESCORE_CHAT_LIMIT and not v.club_allowed: return '', 403 if TRUESCORE_CHAT_MINIMUM and v.truescore < TRUESCORE_CHAT_MINIMUM and not v.club_allowed: return '', 403
vname = v.username.lower() vname = v.username.lower()
if vname in muted and not v.admin_level >= PERMS['CHAT_BYPASS_MUTE']: if vname in muted and not v.admin_level >= PERMS['CHAT_BYPASS_MUTE']:

View File

@ -101,7 +101,7 @@ def comment(v):
parent_post = get_post(parent.parent_submission, v=v) parent_post = get_post(parent.parent_submission, v=v)
parent_comment_id = parent.id parent_comment_id = parent.id
if parent.author_id == v.id: rts = True if parent.author_id == v.id: rts = True
if not v.can_post_in_ghost_threads and parent_post.ghost: abort(403, f"You need {TRUESCORE_GHOST_LIMIT} truescore to post in ghost threads") if not v.can_post_in_ghost_threads and parent_post.ghost: abort(403, f"You need {TRUESCORE_GHOST_MINIMUM} truescore to post in ghost threads")
else: abort(400) else: abort(400)
level = 1 if isinstance(parent, Submission) else parent.level + 1 level = 1 if isinstance(parent, Submission) else parent.level + 1

View File

@ -61,7 +61,7 @@ def inject_constants():
"TELEGRAM_LINK":TELEGRAM_LINK, "EMAIL_REGEX_PATTERN":EMAIL_REGEX_PATTERN, "TELEGRAM_LINK":TELEGRAM_LINK, "EMAIL_REGEX_PATTERN":EMAIL_REGEX_PATTERN,
"CONTENT_SECURITY_POLICY_DEFAULT":CONTENT_SECURITY_POLICY_DEFAULT, "CONTENT_SECURITY_POLICY_DEFAULT":CONTENT_SECURITY_POLICY_DEFAULT,
"CONTENT_SECURITY_POLICY_HOME":CONTENT_SECURITY_POLICY_HOME, "CONTENT_SECURITY_POLICY_HOME":CONTENT_SECURITY_POLICY_HOME,
"TRUESCORE_DONATE_LIMIT":TRUESCORE_DONATE_LIMIT, "TRUESCORE_DONATE_MINIMUM":TRUESCORE_DONATE_MINIMUM,
"DONATE_LINK":DONATE_LINK, "DONATE_SERVICE":DONATE_SERVICE, "BAN_EVASION_DOMAIN":BAN_EVASION_DOMAIN, "DONATE_LINK":DONATE_LINK, "DONATE_SERVICE":DONATE_SERVICE, "BAN_EVASION_DOMAIN":BAN_EVASION_DOMAIN,
"HOUSE_JOIN_COST":HOUSE_JOIN_COST, "HOUSE_SWITCH_COST":HOUSE_SWITCH_COST, "IMAGE_FORMATS":IMAGE_FORMATS, "HOUSE_JOIN_COST":HOUSE_JOIN_COST, "HOUSE_SWITCH_COST":HOUSE_SWITCH_COST, "IMAGE_FORMATS":IMAGE_FORMATS,
"PAGE_SIZES":PAGE_SIZES, "THEMES":THEMES, "COMMENT_SORTS":COMMENT_SORTS, "SORTS":SORTS, "PAGE_SIZES":PAGE_SIZES, "THEMES":THEMES, "COMMENT_SORTS":COMMENT_SORTS, "SORTS":SORTS,

View File

@ -5,7 +5,7 @@
<div class="overflow-x-auto"> <div class="overflow-x-auto">
<table class="table table-striped mb-5"> <table class="table table-striped mb-5">
<tbody> <tbody>
{% if v and v.truescore >= TRUESCORE_DONATE_LIMIT %} {% if v and v.truescore >= TRUESCORE_DONATE_MINIMUM %}
<tr> <tr>
<td>Kofi</td> <td>Kofi</td>
<td><a rel="nofollow noopener" href="{{KOFI_LINK}}">{{KOFI_LINK}}</a></td> <td><a rel="nofollow noopener" href="{{KOFI_LINK}}">{{KOFI_LINK}}</a></td>

View File

@ -5,7 +5,7 @@
<div class="overflow-x-auto"> <div class="overflow-x-auto">
<table class="table table-striped mb-5"> <table class="table table-striped mb-5">
<tbody> <tbody>
{% if v and v.truescore >= TRUESCORE_DONATE_LIMIT %} {% if v and v.truescore >= TRUESCORE_DONATE_MINIMUM %}
<tr> <tr>
<td>Gumroad</td> <td>Gumroad</td>
<td><a rel="nofollow noopener" href="{{GUMROAD_LINK}}">{{GUMROAD_LINK}}</a></td> <td><a rel="nofollow noopener" href="{{GUMROAD_LINK}}">{{GUMROAD_LINK}}</a></td>

View File

@ -25,7 +25,7 @@
</div> </div>
<div class="body w-lg-100"> <div class="body w-lg-100">
<p>You're a {{TIERS_ID_TO_NAME[v.patron] if v.patron else "freeloader"}}!</p>{% if v.patron %} Thanks ily! &lt;3{% endif %} <p>You're a {{TIERS_ID_TO_NAME[v.patron] if v.patron else "freeloader"}}!</p>{% if v.patron %} Thanks ily! &lt;3{% endif %}
{% if not v.patron and v.truescore >= TRUESCORE_DONATE_LIMIT %} {% if not v.patron and v.truescore >= TRUESCORE_DONATE_MINIMUM %}
<p class="font-italic">To stop freeloading, first <a href="/settings/security#new_email">verify your email</a>, support us on <a href="{{DONATE_LINK}}">{{DONATE_SERVICE}}</a> with the same email, and click "Claim {{patron}} Rewards"</p> <p class="font-italic">To stop freeloading, first <a href="/settings/security#new_email">verify your email</a>, support us on <a href="{{DONATE_LINK}}">{{DONATE_SERVICE}}</a> with the same email, and click "Claim {{patron}} Rewards"</p>
{% elif not v.patron %} {% elif not v.patron %}
<p class="font-italic">To stop freeloading, you can <a href="/donate">donate via crypto</a>. Please let us know first beforehand by <a href="/contact">sending us a modmail.</a> Thanks!</p> <p class="font-italic">To stop freeloading, you can <a href="/donate">donate via crypto</a>. Please let us know first beforehand by <a href="/contact">sending us a modmail.</a> Thanks!</p>

View File

@ -50,7 +50,7 @@
</div> </div>
{% if FEATURES['MARSEYBUX'] %} {% if FEATURES['MARSEYBUX'] %}
<span class="text-small text-muted pl-1">Must be same email as the one you used to donate <span class="text-small text-muted pl-1">Must be same email as the one you used to donate
{% if v.truescore >= TRUESCORE_DONATE_LIMIT %} {% if v.truescore >= TRUESCORE_DONATE_MINIMUM %}
on on
{% if KOFI_TOKEN %} {% if KOFI_TOKEN %}
<a rel="nofollow noopener" class="text-primary" href="{{KOFI_LINK}}">Kofi</a> <a rel="nofollow noopener" class="text-primary" href="{{KOFI_LINK}}">Kofi</a>