gfMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/__main__.py

@@ -55,6 +55,7 @@ app.config["READ_ONLY"]=bool(int(environ.get("READ_ONLY", "0")))
 app.config["BOT_DISABLE"]=bool(int(environ.get("BOT_DISABLE", False)))
 app.config["CACHE_TYPE"] = "RedisCache"
 app.config["CACHE_REDIS_URL"] = environ.get("REDIS_URL", "redis://localhost")
+app.config["CACHE_KEY_PREFIX"] = app.config["SITE_NAME"]
 app.config['MAIL_SERVER'] = 'smtp.gmail.com'
 app.config['MAIL_PORT'] = 587
 app.config['MAIL_USE_TLS'] = True

files/routes/front.py

@@ -174,7 +174,7 @@ def front_all(v, sub=None):
 					filter_words=v.filter_words if v else [],
 					gt=gt,
 					lt=lt,
-					sub=sub,
+					sub=sub
 					)
 
 	posts = get_posts(ids, v=v)
@@ -266,6 +266,8 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
 	posts = g.db.query(Submission)
 	
 	if sub: posts = posts.filter_by(sub=sub.name)
+	elif SITE_NAME == '2Much4You': posts = posts.filter(Submission.sub != None)
+	else: posts = posts.filter_by(sub=None)
 
 	if gt: posts = posts.filter(Submission.created_utc > gt)
 	if lt: posts = posts.filter(Submission.created_utc < lt)

files/templates/comments.html

@@ -225,7 +225,7 @@
 				{% if c.ghost %}
 					👻
 				{% else %}
-					{% if c.author.house %}
+					{% if SITE_NAME=='Drama' and c.author.house %}
 						<img src="/assets/images/{{SITE_NAME}}/houses/{{c.author.house}}.webp?a=5" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{c.author.house}}">
 					{% endif %}
 

files/templates/submission.html

@@ -448,7 +448,7 @@
 						{% if p.ghost %}
 							👻
 						{% else %}
-							{% if p.author.house %}
+							{% if SITE_NAME=='Drama' and p.author.house %}
 								<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?a=5" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{p.author.house}}">
 							{% endif %}
 

files/templates/submission_listing.html

@@ -184,7 +184,7 @@
 				{% if p.ghost %}
 					👻
 				{% else %}
-					{% if p.author.house %}
+					{% if SITE_NAME=='Drama' and p.author.house %}
 						<img src="/assets/images/{{SITE_NAME}}/houses/{{p.author.house}}.webp?a=5" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{p.author.house}}">
 					{% endif %}
 

files/templates/submit.html

@@ -79,14 +79,11 @@
 
 												<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
 
-												{% if SUBS %}
+												{% if SITE_NAME=='2Much4You' %}
 													<label class='mt-4' for="title">Sub</label>
 
 													<div class="input-group mb2">
 														<select autocomplete="off" id='sub' class="form-control" form="submitform" name="sub">
-															<option {% if not sub %}selected{% endif %}>
-																general
-															</option>
 															{% for s in SUBS %}
 																<option value="{{s}}" {% if sub.name == s %}selected{% endif %}>
 																	/s/{{s}}

files/templates/userpage.html

@@ -57,7 +57,7 @@
 									<i class="fad fa-user-tag text-info align-middle ml-2" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Original Username: @{{u.original_username}}"></i>
 								</span>
 								{% endif %}
-								{% if u.house %}
+								{% if SITE_NAME=='Drama' and u.house %}
 									<img src="/assets/images/{{SITE_NAME}}/houses/{{u.house}}.webp?a=5" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{u.house}}">
 								{% endif %}
 
@@ -352,7 +352,7 @@
 					<h5 class="text-primary">BANNED USER{% if u.ban_reason %}: {{u.ban_reason}}{% endif %}</h5>
 					{% if u.unban_utc %}<h5 class="text-primary">>{{u.unban_string}}</h5>{% endif %}
 				{% endif %}
-				{% if u.house %}
+				{% if SITE_NAME=='Drama' and u.house %}
 					<img src="/assets/images/{{SITE_NAME}}/houses/{{u.house}}.webp?a=5" height="20" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="House {{u.house}}">
 				{% endif %}