rework env vars a bit

docker-compose.yml

@@ -11,7 +11,7 @@ services:
         environment:
             - DATABASE_URL=postgresql://postgres@postgres:5432
             - REDIS_URL=redis://redis
-            - OPERA_URL=http://opera-proxy:18080
+            - PROXY_URL=http://opera-proxy:18080
         links:
             - "redis"
             - "postgres"

env

@@ -1,12 +1,14 @@
 FLASK_APP=/rDrama/files/cli:app
-MASTER_KEY=blahblahblah
 DOMAIN=localhost
 SITE_NAME=rDrama
+MASTER_KEY=blahblahblah
+PROXY_URL=http://localhost:18080
 GIPHY_KEY=blahblahblah
 DISCORD_SERVER_ID=blahblahblah
 DISCORD_CLIENT_ID=blahblahblah
 DISCORD_CLIENT_SECRET=blahblahblah
 DISCORD_BOT_TOKEN=blahblahblah
+HCAPTCHA_SITEKEY=blahblahblah
 HCAPTCHA_SECRET=blahblahblah
 YOUTUBE_KEY=blahblahblah
 PUSHER_ID=blahblahblah
@@ -25,7 +27,7 @@ CARD_VIEW=0
 DISABLE_DOWNVOTES=0
 DUES=0
 DEFAULT_THEME=midnight
-DEFAULT_COLOR=ff66ac
+DEFAULT_COLOR=805ad5
 MAIL_USERNAME=blahblahblah@gmail.com
 MAIL_PASSWORD=blahblahblah
 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!

files/classes/submission.py

@@ -416,7 +416,7 @@ class Submission(Base):
 	def realtitle(self, v):
 		if self.club and not (v and (v.paid_dues or v.id == self.author_id)):
 			if v: return random.choice(TROLLTITLES).format(username=v.username)
-			elif dues == -2: return f'Please make an account to see this post'
+			elif DUES == -2: return f'Please make an account to see this post'
 			else: return f'{CC} MEMBERS ONLY'
 		elif self.title_html: title = self.title_html
 		else: title = self.title

files/classes/user.py

@@ -417,7 +417,7 @@ class User(Base):
 		if not FEATURES['COUNTRY_CLUB']: return True
 		if self.shadowbanned: return False
 		if self.is_suspended_permanently: return False
-		return self.admin_level >= PERMS['VIEW_CLUB'] or self.club_allowed or (self.club_allowed != False and self.truecoins >= dues)
+		return self.admin_level >= PERMS['VIEW_CLUB'] or self.club_allowed or (self.club_allowed != False and self.truecoins >= DUES)
 
 	@lazy
 	def any_block_exists(self, other):

files/helpers/jinja2.py

@@ -69,7 +69,7 @@ def inject_constants():
 			"DEFAULT_THEME":DEFAULT_THEME, "DESCRIPTION":DESCRIPTION,
 			"has_sidebar":has_sidebar, "has_logo":has_logo, "has_app":has_app,
 			"FP":FP, "NOTIF_MODACTION_JL_MIN":NOTIF_MODACTION_JL_MIN, "cache":cache,
-			"ONLINE_STR":ONLINE_STR, "patron":patron, "dues":dues,
+			"ONLINE_STR":ONLINE_STR, "patron":patron, "DUES":DUES,
 			"SIDEBAR_THREAD":SIDEBAR_THREAD, "BANNER_THREAD":BANNER_THREAD,
 			"BADGE_THREAD":BADGE_THREAD, "SNAPPY_THREAD":SNAPPY_THREAD,
 			"KOFI_TOKEN":KOFI_TOKEN, "KOFI_LINK":KOFI_LINK,

files/routes/login.py

@@ -310,7 +310,7 @@ def sign_up_post(v):
 	if existing_account:
 		return signup_error("An account with that username already exists.")
 
-	if HCAPTCHA_SITEKEY:
+	if HCAPTCHA_SITEKEY != 'blahblahblah':
 		token = request.values.get("h-captcha-response")
 		if not token:
 			return signup_error("Unable to verify captcha [1].")

files/templates/submit.html

@@ -169,7 +169,7 @@
 												{% if FEATURES['COUNTRY_CLUB'] -%}
 												<div class="custom-control custom-checkbox">
 													<input autocomplete="off" type="checkbox" class="custom-control-input" id="post-club" name="club" onchange="savetext()">
-													<label class="custom-control-label" for="post-club">{{CC_TITLE}} thread {% if dues <= 0 %}(hides threads from logged-out users){% endif %}</label>
+													<label class="custom-control-label" for="post-club">{{CC_TITLE}} thread {% if DUES <= 0 %}(hides threads from logged-out users){% endif %}</label>
 												</div>
 												{%- endif %}