diff --git a/env b/env index e4db2e565..4362446aa 100644 --- a/env +++ b/env @@ -32,7 +32,7 @@ export DESCRIPTION="rdrama.net caters to drama in all forms such as: Real life, export TAGLINE="the world's largest gay orgy" export CF_KEY="blahblahblah" export CF_ZONE="blahblahblah" +export TELEGRAM_LINK="blahblahblah" export DEBIAN_FRONTEND="noninteractive" export NODE_VERSION="16.13.0" export NVM_DIRECTORY="/root/.nvm" -export TELEGRAM_LINK="blahblahblah" diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 51a283ea7..104f5a52b 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -4,38 +4,38 @@ from os import environ, path import tldextract DEFAULT_CONFIG_VALUE = "blahblahblah" -SITE = environ.get("SITE", "localhost").strip() -SITE_NAME = environ.get("SITE_NAME", "rdrama.net").strip() -SECRET_KEY = environ.get("SECRET_KEY", DEFAULT_CONFIG_VALUE).strip() -PROXY_URL = environ.get("PROXY_URL", "http://localhost:18080").strip() -LOG_DIRECTORY = environ.get("LOG_DIRECTORY", "/var/log/rdrama") -SETTINGS_FILENAME = environ.get("SETTINGS_FILENAME", "/site_settings.json") -GIPHY_KEY = environ.get("GIPHY_KEY", DEFAULT_CONFIG_VALUE).strip() -DISCORD_BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN", DEFAULT_CONFIG_VALUE).strip() -TURNSTILE_SITEKEY = environ.get("TURNSTILE_SITEKEY", DEFAULT_CONFIG_VALUE).strip() -TURNSTILE_SECRET = environ.get("TURNSTILE_SECRET", DEFAULT_CONFIG_VALUE).strip() -YOUTUBE_KEY = environ.get("YOUTUBE_KEY", DEFAULT_CONFIG_VALUE).strip() -VAPID_PUBLIC_KEY = environ.get("VAPID_PUBLIC_KEY", DEFAULT_CONFIG_VALUE).strip() -VAPID_PRIVATE_KEY = environ.get("VAPID_PRIVATE_KEY", DEFAULT_CONFIG_VALUE).strip() -SPAM_SIMILARITY_THRESHOLD = float(environ.get("SPAM_SIMILARITY_THRESHOLD", "0.5").strip()) -SPAM_URL_SIMILARITY_THRESHOLD = float(environ.get("SPAM_URL_SIMILARITY_THRESHOLD", "0.1").strip()) -SPAM_SIMILAR_COUNT_THRESHOLD = int(environ.get("SPAM_SIMILAR_COUNT_THRESHOLD", "10").strip()) -COMMENT_SPAM_SIMILAR_THRESHOLD = float(environ.get("COMMENT_SPAM_SIMILAR_THRESHOLD", "0.5").strip()) -COMMENT_SPAM_COUNT_THRESHOLD = int(environ.get("COMMENT_SPAM_COUNT_THRESHOLD", "10").strip()) -DEFAULT_TIME_FILTER = environ.get("DEFAULT_TIME_FILTER", "all").strip() -GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN", DEFAULT_CONFIG_VALUE).strip() -GUMROAD_LINK = environ.get("GUMROAD_LINK", DEFAULT_CONFIG_VALUE).strip() -GUMROAD_ID = environ.get("GUMROAD_ID", DEFAULT_CONFIG_VALUE).strip() -DISABLE_DOWNVOTES = bool(int(environ.get("DISABLE_DOWNVOTES", "0").strip())) -DEFAULT_THEME = environ.get("DEFAULT_THEME", "midnight").strip() -DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "805ad5").strip() -EMAIL = environ.get("EMAIL", "blahblahblah@gmail.com").strip() -MAILGUN_KEY = environ.get("MAILGUN_KEY", DEFAULT_CONFIG_VALUE).strip() -DESCRIPTION = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!").strip() -TAGLINE = environ.get("TAGLINE", "the world's largest gay orgy").strip() -CF_KEY = environ.get("CF_KEY", DEFAULT_CONFIG_VALUE).strip() -CF_ZONE = environ.get("CF_ZONE", DEFAULT_CONFIG_VALUE).strip() -TELEGRAM_LINK = environ.get("TELEGRAM_LINK", DEFAULT_CONFIG_VALUE).strip() +SITE = environ.get("SITE").strip() +SITE_NAME = environ.get("SITE_NAME").strip() +SECRET_KEY = environ.get("SECRET_KEY").strip() +PROXY_URL = environ.get("PROXY_URL").strip() +LOG_DIRECTORY = environ.get("LOG_DIRECTORY") +SETTINGS_FILENAME = environ.get("SETTINGS_FILENAME") +GIPHY_KEY = environ.get("GIPHY_KEY").strip() +DISCORD_BOT_TOKEN = environ.get("DISCORD_BOT_TOKEN").strip() +TURNSTILE_SITEKEY = environ.get("TURNSTILE_SITEKEY").strip() +TURNSTILE_SECRET = environ.get("TURNSTILE_SECRET").strip() +YOUTUBE_KEY = environ.get("YOUTUBE_KEY").strip() +VAPID_PUBLIC_KEY = environ.get("VAPID_PUBLIC_KEY").strip() +VAPID_PRIVATE_KEY = environ.get("VAPID_PRIVATE_KEY").strip() +SPAM_SIMILARITY_THRESHOLD = float(environ.get("SPAM_SIMILARITY_THRESHOLD").strip()) +SPAM_URL_SIMILARITY_THRESHOLD = float(environ.get("SPAM_URL_SIMILARITY_THRESHOLD").strip()) +SPAM_SIMILAR_COUNT_THRESHOLD = int(environ.get("SPAM_SIMILAR_COUNT_THRESHOLD").strip()) +COMMENT_SPAM_SIMILAR_THRESHOLD = float(environ.get("COMMENT_SPAM_SIMILAR_THRESHOLD").strip()) +COMMENT_SPAM_COUNT_THRESHOLD = int(environ.get("COMMENT_SPAM_COUNT_THRESHOLD").strip()) +DEFAULT_TIME_FILTER = environ.get("DEFAULT_TIME_FILTER").strip() +GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN").strip() +GUMROAD_LINK = environ.get("GUMROAD_LINK").strip() +GUMROAD_ID = environ.get("GUMROAD_ID").strip() +DISABLE_DOWNVOTES = bool(int(environ.get("DISABLE_DOWNVOTES").strip())) +DEFAULT_THEME = environ.get("DEFAULT_THEME").strip() +DEFAULT_COLOR = environ.get("DEFAULT_COLOR").strip() +EMAIL = environ.get("EMAIL").strip() +MAILGUN_KEY = environ.get("MAILGUN_KEY").strip() +DESCRIPTION = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch).strip() +TAGLINE = environ.get("TAGLINE").strip() +CF_KEY = environ.get("CF_KEY").strip() +CF_ZONE = environ.get("CF_ZONE").strip() +TELEGRAM_LINK = environ.get("TELEGRAM_LINK").strip() GLOBAL = environ.get("GLOBAL", "").strip() blackjack = environ.get("BLACKJACK", "").strip() blackjack2 = environ.get("BLACKJACK2", "").strip() @@ -476,8 +476,8 @@ LEADERBOARD_LIMIT = PAGE_SIZE HOUSE_JOIN_COST = 500 HOUSE_SWITCH_COST = 2000 -DONATE_SERVICE = "Gumroad" if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE else "KoFi" -DONATE_LINK = GUMROAD_LINK if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE else KOFI_LINK +DONATE_SERVICE = "KoFi" if KOFI_TOKEN else "Gumroad" +DONATE_LINK = KOFI_LINK if KOFI_TOKEN else GUMROAD_LINK TIERS_ID_TO_NAME = { 1: "Paypig", 2: "Renthog", diff --git a/files/routes/users.py b/files/routes/users.py index bcb3fbd3a..eb23220cf 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -1227,7 +1227,7 @@ def bid_list(v:User, bid): @app.post("/kofi") def kofi(): - if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE: abort(404) + if not KOFI_TOKEN: abort(404) data = json.loads(request.values['data']) verification_token = data['verification_token'] if verification_token != KOFI_TOKEN: abort(400) @@ -1266,7 +1266,7 @@ kofi_tiers={ @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @auth_required def settings_kofi(v:User): - if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE: abort(404) + if not KOFI_TOKEN: abort(404) if not (v.email and v.is_activated): abort(400, f"You must have a verified email to verify {patron} status and claim your rewards!")