diff --git a/files/classes/user.py b/files/classes/user.py index 46cae62b6..4d2289e68 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -1032,10 +1032,10 @@ class User(Base): @property @lazy 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.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 return False diff --git a/files/helpers/const.py b/files/helpers/const.py index 12755d760..69e89bd97 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -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 MIN_REPOST_CHECK_URL_LENGTH = 9 # also change the constant in checkRepost() of submit.js CHAT_LENGTH_LIMIT = 1000 -TRUESCORE_DONATE_LIMIT = 100 COSMETIC_AWARD_COIN_AWARD_PCT = 0.10 -TRUESCORE_CHAT_LIMIT = 0 -TRUESCORE_GHOST_LIMIT = 0 +TRUESCORE_CHAT_MINIMUM = 0 +TRUESCORE_DONATE_MINIMUM = 100 +TRUESCORE_GHOST_MINIMUM = 0 LOGGEDIN_ACTIVE_TIME = 15 * 60 PFP_DEFAULT_MARSEY = True @@ -494,8 +494,8 @@ if SITE == 'rdrama.net': NOTIFICATION_THREAD = 6489 CHAT_LENGTH_LIMIT = 200 - TRUESCORE_CHAT_LIMIT = 10 - TRUESCORE_GHOST_LIMIT = 10 + TRUESCORE_CHAT_MINIMUM = 10 + TRUESCORE_GHOST_MINIMUM = 10 NEW_USER_HAT_AGE = 7 * 86400 HOLE_COST = 50000 @@ -629,8 +629,8 @@ elif SITE == 'watchpeopledie.tv': SIDEBAR_THREAD = 5403 BANNER_THREAD = 9869 - TRUESCORE_CHAT_LIMIT = 10 - TRUESCORE_GHOST_LIMIT = 10 + TRUESCORE_CHAT_MINIMUM = 10 + TRUESCORE_GHOST_MINIMUM = 10 HOLE_NAME = 'flair' HOLE_STYLE_FLAIR = True diff --git a/files/routes/chat.py b/files/routes/chat.py index 1fe22bd89..0a0cc3fdc 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -39,8 +39,8 @@ user_ids_to_socket_ids = {} @app.get("/chat") @is_not_permabanned def chat(v): - if TRUESCORE_CHAT_LIMIT and v.truescore < TRUESCORE_CHAT_LIMIT and not v.club_allowed: - abort(403, f"Need at least {TRUESCORE_CHAT_LIMIT} truescore for access to chat.") + if TRUESCORE_CHAT_MINIMUM and v.truescore < TRUESCORE_CHAT_MINIMUM and not v.club_allowed: + abort(403, f"Need at least {TRUESCORE_CHAT_MINIMUM} truescore for access to chat.") return render_template("chat.html", v=v, messages=messages) @@ -50,7 +50,7 @@ def chat(v): @ratelimit_user("3/second;10/minute") def speak(data, v): 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() if vname in muted and not v.admin_level >= PERMS['CHAT_BYPASS_MUTE']: diff --git a/files/routes/comments.py b/files/routes/comments.py index bc19459c5..334455f16 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -101,7 +101,7 @@ def comment(v): parent_post = get_post(parent.parent_submission, v=v) parent_comment_id = parent.id 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) level = 1 if isinstance(parent, Submission) else parent.level + 1 diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 5017cc3c4..7decd1154 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -61,7 +61,7 @@ def inject_constants(): "TELEGRAM_LINK":TELEGRAM_LINK, "EMAIL_REGEX_PATTERN":EMAIL_REGEX_PATTERN, "CONTENT_SECURITY_POLICY_DEFAULT":CONTENT_SECURITY_POLICY_DEFAULT, "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, "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, diff --git a/files/templates/donate_WPD.html b/files/templates/donate_WPD.html index 219507850..09a9e04e9 100644 --- a/files/templates/donate_WPD.html +++ b/files/templates/donate_WPD.html @@ -5,7 +5,7 @@
- {% if v and v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if v and v.truescore >= TRUESCORE_DONATE_MINIMUM %} diff --git a/files/templates/donate_rDrama.html b/files/templates/donate_rDrama.html index 16c159a31..37e9c7e95 100644 --- a/files/templates/donate_rDrama.html +++ b/files/templates/donate_rDrama.html @@ -5,7 +5,7 @@
Kofi {{KOFI_LINK}}
- {% if v and v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if v and v.truescore >= TRUESCORE_DONATE_MINIMUM %} diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html index f9ad5d342..ed79fcbf7 100644 --- a/files/templates/settings/personal.html +++ b/files/templates/settings/personal.html @@ -25,7 +25,7 @@

You're a {{TIERS_ID_TO_NAME[v.patron] if v.patron else "freeloader"}}!

{% if v.patron %} Thanks ily! <3{% endif %} - {% if not v.patron and v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if not v.patron and v.truescore >= TRUESCORE_DONATE_MINIMUM %}

To stop freeloading, first verify your email, support us on {{DONATE_SERVICE}} with the same email, and click "Claim {{patron}} Rewards"

{% elif not v.patron %}

To stop freeloading, you can donate via crypto. Please let us know first beforehand by sending us a modmail. Thanks!

diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html index 8f95e94c3..6495e4140 100644 --- a/files/templates/settings/security.html +++ b/files/templates/settings/security.html @@ -50,7 +50,7 @@
{% if FEATURES['MARSEYBUX'] %} Must be same email as the one you used to donate - {% if v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if v.truescore >= TRUESCORE_DONATE_MINIMUM %} on {% if KOFI_TOKEN %} Kofi
Gumroad {{GUMROAD_LINK}}