From da8eca93486e98fcdf2db2c1ee4cb413d401ac09 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Tue, 8 Feb 2022 20:58:52 +0200
Subject: [PATCH 1/2] vxc

---
 files/__main__.py                     |   1 +
 files/assets/images/subs/general.webp | Bin 0 -> 3186 bytes
 files/routes/front.py                 |   4 +++-
 files/templates/submit.html           |   5 +----
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 files/assets/images/subs/general.webp

diff --git a/files/__main__.py b/files/__main__.py
index c5c967b75..81ff55dd8 100644
--- a/files/__main__.py
+++ b/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
diff --git a/files/assets/images/subs/general.webp b/files/assets/images/subs/general.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b97b04dbe899a1a61ae0f3c222c4d9957481727f
GIT binary patch
literal 3186
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
Yj3^0iGn{uX^ElZ7newmz0000001bgS3IG5A

literal 0
HcmV?d00001

diff --git a/files/routes/front.py b/files/routes/front.py
index 38feab2ba..1829b5efd 100644
--- a/files/routes/front.py
+++ b/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)
diff --git a/files/templates/submit.html b/files/templates/submit.html
index f089b75b3..3b9da5be1 100644
--- a/files/templates/submit.html
+++ b/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}}

From 3228303691f61cb8a29070fc9f71fc944224de6e Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Tue, 8 Feb 2022 21:01:23 +0200
Subject: [PATCH 2/2] fg

---
 files/templates/comments.html           | 2 +-
 files/templates/submission.html         | 2 +-
 files/templates/submission_listing.html | 2 +-
 files/templates/userpage.html           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 875c3b0ab..f49139c7a 100644
--- a/files/templates/comments.html
+++ b/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 %}
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index fdf359954..2c8f994d3 100644
--- a/files/templates/submission.html
+++ b/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 %}
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index fea1ab2d3..6ff2e4b95 100644
--- a/files/templates/submission_listing.html
+++ b/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 %}
 
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 2e212d4a6..e8e398163 100644
--- a/files/templates/userpage.html
+++ b/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 %}