From fa9cb897e853ea87590eae4ef3d5592b0d9a4841 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 11 Dec 2021 20:08:03 +0200
Subject: [PATCH] fsdfds

---
 files/routes/posts.py                   | 2 +-
 files/templates/admin/apps.html         | 2 +-
 files/templates/comments.html           | 6 +++---
 files/templates/contact.html            | 4 ++--
 files/templates/settings_filters.html   | 6 +++---
 files/templates/sign_up.html            | 2 +-
 files/templates/submission.html         | 4 ++--
 files/templates/submission_listing.html | 6 +++---
 files/templates/submit.html             | 2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index 0a2c613370..b3ff39d044 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -697,7 +697,7 @@ def thumbnail_thread(pid):
 		for chunk in image_req.iter_content(1024):
 			file.write(chunk)
 
-	post.thumburl = "https://" + site + process_image(name, True)
+	post.thumburl = f"https://{site}/" + process_image(name, True)
 	db.add(post)
 	db.commit()
 	db.close()
diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html
index 07e3e4d875..bf9cd895f8 100644
--- a/files/templates/admin/apps.html
+++ b/files/templates/admin/apps.html
@@ -14,7 +14,7 @@
 <div class="settings-section rounded">
 	<div class="d-lg-flex">
 			<div class="title w-lg-25">
-						<label for="over18"><a href="{{app.permalink}}" target="_blank">{{app.app_name}}</a></label>
+						<label for="over18"><a href="{{app.permalink}}" {% if v and v.newtab %}target="_blank"{% endif %}>{{app.app_name}}</a></label>
 				</div>
 				<div class="body w-lg-100">
 			<label for="edit-{{app.id}}-author" class="mb-0 w-lg-25">User</label>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 6c799a80d6..230db87a7f 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -57,7 +57,7 @@
 			<span class="text-black">coins</span>
 		</span>  
 		&nbsp;&nbsp;&nbsp;&nbsp;
-		<a target="_blank" class="pop-viewmore ml-auto text-decoration-none">
+		<a {% if v and v.newtab %}target="_blank"{% endif %} class="pop-viewmore ml-auto text-decoration-none">
 		  View
 		  <i class="fas fa-arrow-right fa-sm px-1"></i>
 		</a>
@@ -295,7 +295,7 @@
 						<a id="cancel-edit-{{c.id}}" href="javascript:void(0)" onclick="toggleEdit('{{c.id}}')" class="btn btn-link text-muted ml-auto cancel-form fl-r commentmob">Cancel</a> 
 					</form>
 					<div id="preview-edit-{{c.id}}" class="mb-3 mt-5"></div>
-					<div class="form-text text-small p-0 m-0"><a href="/formatting" target="_blank">Formatting help</a></div>
+					<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab %}target="_blank"{% endif %}>Formatting help</a></div>
 				</div>
 				{% endif %}
 				<div id="comment-{{c.id}}-actions" class="comment-actions{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}">
@@ -463,7 +463,7 @@
 					<a href="javascript:void(0)" onclick="document.getElementById('reply-to-{{c.id}}').classList.add('d-none')" class="btn btn-link text-muted ml-auto cancel-form fl-r commentmob">Cancel</a> 
 				</form>
 				<div id="reply-edit-{{c.id}}" class="mb-3 mt-5"></div>
-				<div class="form-text text-small p-0 m-0"><a href="/formatting" target="_blank">Formatting help</a></div>
+				<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab %}target="_blank"{% endif %}>Formatting help</a></div>
 			</div>
 		</div>
 
diff --git a/files/templates/contact.html b/files/templates/contact.html
index deb999b8d0..81884571f6 100644
--- a/files/templates/contact.html
+++ b/files/templates/contact.html
@@ -50,11 +50,11 @@
 
 {% elif v %}
 
-<p>Please <a target="_blank" href="/settings/security">verify your email address</a> in order to ensure we can respond to your message if needed. Then, refresh this page.</p>
+<p>Please <a {% if v and v.newtab %}target="_blank"{% endif %} href="/settings/security">verify your email address</a> in order to ensure we can respond to your message if needed. Then, refresh this page.</p>
 
 {% else %}
 
-<p>In order to ensure that we can respond to your message, please first <a href="/signup" target="_blank">sign up</a> or <a href="/login" target="_blank">log in</a> and make sure you have <a target="_blank" href="/settings/security">verified your email address</a>. Then, refresh this page.</p>
+<p>In order to ensure that we can respond to your message, please first <a href="/signup" {% if v and v.newtab %}target="_blank"{% endif %}>sign up</a> or <a href="/login" {% if v and v.newtab %}target="_blank"{% endif %}>log in</a> and make sure you have <a {% if v and v.newtab %}target="_blank"{% endif %} href="/settings/security">verified your email address</a>. Then, refresh this page.</p>
 
 {% endif %}
 
diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html
index 59d0ec75cd..b344288081 100644
--- a/files/templates/settings_filters.html
+++ b/files/templates/settings_filters.html
@@ -105,7 +105,7 @@
 				<div class="d-lg-flex border-bottom">
 
 					<div class="title w-lg-25">
-						<label for="newtab">Open Threads In New Tabs</label>
+						<label for="newtab">Open Internal Links In New Tabs</label>
 					</div>
 
 					<div class="body w-lg-100">
@@ -115,7 +115,7 @@
 							<label class="custom-control-label" for="newtab"></label>
 						</div>
 
-						<span class="text-small-extra text-muted">Enable if you would like to automatically open threads in new tabs.</span>
+						<span class="text-small-extra text-muted">Enable if you would like to automatically open links to other pages in the site in new tabs.</span>
 
 					</div>
 
@@ -135,7 +135,7 @@
 							<label class="custom-control-label" for="newtabexternal"></label>
 						</div>
 
-						<span class="text-small-extra text-muted">Enable if you would like to automatically open external links in new tabs.</span>
+						<span class="text-small-extra text-muted">Enable if you would like to automatically open links to other sites in new tabs.</span>
 
 					</div>
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 2417c8d898..c4687f4fc9 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -111,7 +111,7 @@
 														<div class="custom-control custom-checkbox mt-4">
 																<input type="checkbox" class="custom-control-input" id="termsCheck" required>
 																<label class="custom-control-label terms" for="termsCheck">I accept the <a
-																		href="/rules" target="_blank">terms and conditions</a></label>
+																		href="/rules" {% if v and v.newtab %}target="_blank"{% endif %}>terms and conditions</a></label>
 														</div>
 
 														{% if hcaptcha %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index f5536d1560..6b1b34b640 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -470,7 +470,7 @@
 								<a href="javascript:void(0)" onclick="togglePostEdit('{{p.id}}')" class="btn btn-link text-muted ml-auto cancel-form fl-r">Cancel</a> 
 							</form>
 							<div id="post-edit-{{p.id}}" class="mb-3 mt-5"></div>
-							<div class="form-text text-small p-0 m-0"><a href="/formatting" target="_blank">Formatting help</a></div>
+							<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab %}target="_blank"{% endif %}>Formatting help</a></div>
 						</div>
 					{% endif %}
 
@@ -734,7 +734,7 @@
 			<a id="save-reply-to-{{p.fullname}}" href="javascript:void(0)" form="reply-to-{{p.fullname}}" class="btn btn-primary text-whitebtn ml-auto fl-r" onclick="post_comment('{{p.fullname}}', '{{p.id}}')">Comment</a>
 		</form>
 		<div id="form-preview-{{p.id}}" class="mb-3 mt-5"></div>
-		<div class="form-text text-small p-0 m-0"><a href="/formatting" target="_blank">Formatting help</a></div>
+		<div class="form-text text-small p-0 m-0"><a href="/formatting" {% if v and v.newtab %}target="_blank"{% endif %}>Formatting help</a></div>
 	</div>
 
 	{% if not v and not p.is_banned %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index cb52dadc9a..d818414ce0 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -45,7 +45,7 @@
 			<span class="text-black">coins</span>
 		</span>  
 		&nbsp;&nbsp;&nbsp;&nbsp;
-		<a target="_blank" class="pop-viewmore ml-auto text-decoration-none">
+		<a {% if v and v.newtab %}target="_blank"{% endif %} class="pop-viewmore ml-auto text-decoration-none">
 		  View
 		  <i class="fas fa-arrow-right fa-sm px-1"></i>
 		</a>
@@ -185,7 +185,7 @@
 				<a class="user-name text-decoration-none" onclick='popclick({{p.author.json_popover | tojson}})' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover" href="javascript:void(0)" tabindex="0" style="color: #{{p.author.namecolor}};  font-weight: bold;"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2"><span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level and 'rama' in request.host %}class="mod"{% endif %}>{{p.author.username}}</span></a>{% if p.author.customtitle %}<bdi  style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{% if p.author.quadrant %}<img loading="lazy" height="20" src="/assets/images/quadrants/{{p.author.quadrant}}.webp?v=1">{% endif %}{{p.author.customtitle | safe}}</bdi>{% endif %}
 				<span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('timestamp-{{p.id}}','{{p.created_utc}}')" id="timestamp-{{p.id}}">&nbsp;{{p.age_string}}</span>
 				&nbsp;
-				({% if p.realurl(v) %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" target="_blank">{{p.domain}}</a>{% else %}text post{% endif %})
+				({% if p.realurl(v) %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" {% if v and v.newtab %}target="_blank"{% endif %}>{{p.domain}}</a>{% else %}text post{% endif %})
 				{% if p.edited_utc %}
 					&nbsp;&nbsp;Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" onmouseover="timestamp('edited_timestamp-{{p.id}}','{{p.edited_utc}}')">{{p.edited_string}}</span>
 				{% endif %}
@@ -474,7 +474,7 @@
 
 	{% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %}
 		<div style="text-align: center" class="mt-3 mb-4">
-			<a target="_blank" rel="nofollow noopener noreferrer" href="{{p.url}}">
+			<a {% if v and v.newtab %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.url}}">
 				<img loading="lazy" src="/assets/images/loading.webp" data-src="{{p.url}}" class="img-fluid" style="max-height:20rem;" alt="Unable to load image">
 			</a>
 		</div>
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 38d6a81baf..eb4b8ea141 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -126,7 +126,7 @@
 												</label>		
 
 												<pre></pre>
-												<div class="form-text text-small"><a href="/formatting" target="_blank">Formatting help</a></div>
+												<div class="form-text text-small"><a href="/formatting" {% if v and v.newtab %}target="_blank"{% endif %}>Formatting help</a></div>
 												<pre></pre>
 
 												<div class="custom-control custom-checkbox">