From a7acbe98312a8ae07e053a617d84399a148c2f78 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 1 Oct 2022 12:14:46 +0200
Subject: [PATCH] show our email to loggedout visitors in /contact

---
 files/helpers/jinja2.py      |  2 +-
 files/routes/static.py       |  2 +-
 files/templates/contact.html | 45 +++++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index 92251befe..3903e7e82 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -68,4 +68,4 @@ def inject_constants():
 			"CASINO_ENABLED":CASINO_ENABLED, "GUMROAD_LINK":GUMROAD_LINK,
 			"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, "approved_embed_hosts":approved_embed_hosts, "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}
+			"FP":FP, "NOTIF_MODACTION_JL_MIN":NOTIF_MODACTION_JL_MIN, "cache":cache, "ONLINE_STR":ONLINE_STR, "patron":patron, "approved_embed_hosts":approved_embed_hosts, "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, "MAIL_USERNAME":app.config['MAIL_USERNAME']}
diff --git a/files/routes/static.py b/files/routes/static.py
index 8391f4279..0c78e15e8 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -197,7 +197,7 @@ def api(v):
 @app.get("/contact_us")
 @app.get("/press")
 @app.get("/media")
-@auth_required
+@auth_desired
 def contact(v):
 	return render_template("contact.html", v=v)
 
diff --git a/files/templates/contact.html b/files/templates/contact.html
index 9be00801c..202b07c50 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -21,35 +21,38 @@
 
 	<h1 class="article-title">Contact {{SITE_NAME}} Admins</h1>
 
-	<p>Use this form to contact {{SITE_NAME}} Admins.</p>
+	{% if v %}
+		<p>Use this form to contact {{SITE_NAME}} Admins.</p>
 
-	<form id="contactform" action="/send_admin" method="post" enctype="multipart/form-data">
+		<form id="contactform" action="/send_admin" method="post" enctype="multipart/form-data">
 
-		<label for="input-message" class="mt-3">Your message</label>
-		<input type="hidden" name="formkey" value="{{v.formkey}}">
-		<textarea autocomplete="off" maxlength="10000" id="input-message" form="contactform" name="message" class="form-control" required></textarea>
-		<label class="btn btn-secondary format m-0 mt-3" onclick="loadEmojis('input-message')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji">
-			<i class="fas fa-smile-beam"></i>
-		</label>
-		<label class="btn btn-secondary m-0 mt-3" for="file-upload">
-			<div id="filename"><i class="fas fa-file"></i></div>
-			<input autocomplete="off" id="file-upload" accept="image/*, video/*, audio/*" type="file" name="file" multiple="multiple" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename','file-upload')" hidden>
-		</label>
-		<input type="submit" onclick="disable(this)" value="Submit" class="btn btn-primary mt-3">
-	</form>
+			<label for="input-message" class="mt-3">Your message</label>
+			<input type="hidden" name="formkey" value="{{v.formkey}}">
+			<textarea autocomplete="off" maxlength="10000" id="input-message" form="contactform" name="message" class="form-control" required></textarea>
+			<label class="btn btn-secondary format m-0 mt-3" onclick="loadEmojis('input-message')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji">
+				<i class="fas fa-smile-beam"></i>
+			</label>
+			<label class="btn btn-secondary m-0 mt-3" for="file-upload">
+				<div id="filename"><i class="fas fa-file"></i></div>
+				<input autocomplete="off" id="file-upload" accept="image/*, video/*, audio/*" type="file" name="file" multiple="multiple" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="changename('filename','file-upload')" hidden>
+			</label>
+			<input type="submit" onclick="disable(this)" value="Submit" class="btn btn-primary mt-3">
+		</form>
 
-	<pre>
+		<pre>
 
 
-	</pre>
+		</pre>
 
-	<p>Warrant Canary has been moved to <a href="/search/posts/?q=%22Monthly%20Website%20Stats%20Post%22&sort=new&t=all">Monthly Website Stats Posts</a>.</p>
+		<p>Warrant Canary has been moved to <a href="/search/posts/?q=%22Monthly%20Website%20Stats%20Post%22&sort=new&t=all">Monthly Website Stats Posts</a>.</p>
 
-	<pre>
+		<pre>
 
 
-	</pre>
-
-	{% include "emoji_modal.html" %}
+		</pre>
 
+		{% include "emoji_modal.html" %}
+	{% else %}
+		<h4>by email: {{MAIL_USERNAME}}</h4>
+	{% endif %}
 {% endblock %}