From 871b38fc26ae58a91e8bf84cfe4ce0e39e3da148 Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Thu, 2 Sep 2021 00:36:22 +0200
Subject: [PATCH] fdfd

---
 files/helpers/sanitize.py               | 4 ++--
 files/templates/comments.html           | 2 +-
 files/templates/default.html            | 2 +-
 files/templates/formatting.html         | 2 +-
 files/templates/login.html              | 2 +-
 files/templates/settings.html           | 2 +-
 files/templates/settings2.html          | 2 +-
 files/templates/sign_up.html            | 2 +-
 files/templates/sign_up_failed_ref.html | 2 +-
 files/templates/submit.html             | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 19bdcd520..79ef59794 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -241,7 +241,7 @@ def sanitize(sanitized, noimages=False):
 	for rd in ["https://reddit.com/", "https://new.reddit.com/", "https://www.reddit.com/", "https://redd.it/"]:
 		sanitized = sanitized.replace(rd, "https://old.reddit.com/")
 	
-	# sanitized = re.sub('([^">])(https:\/\/[^ <>]*)', r'\1<a target="_blank" href="\2">\2</a>', sanitized)
-	# sanitized = re.sub('<p>(https:\/\/[^ <>]*)', r'<p><a target="_blank" href="\1">\1</a>', sanitized)
+	sanitized = re.sub('([^">=])(https:\/\/[^ <>]*)', r'\1<a target="_blank" href="\2">\2</a>', sanitized)
+	sanitized = re.sub('<p>(https:\/\/[^ <>]*)', r'<p><a target="_blank" href="\1">\1</a>', sanitized)
 
 	return sanitized
diff --git a/files/templates/comments.html b/files/templates/comments.html
index ffcc16906..bf07ee6b8 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -105,7 +105,7 @@
 </div>
 {% endif %}
 
-<div id="comment-{{c.id}}" class="{% if c.unread %}context{% endif %} comment {% if standalone and level==1 %} mt-0{% endif %}{% if c.collapse_for_user(v) or (standalone and c.over_18 and not (v and v.over_18)) %} collapsed{% endif %}" style="border-left: 2px solid #{{c.author.namecolor}}; {% if c.unread %}padding: 10px 10px 10px 0 !important;{% endif %}">
+<div id="comment-{{c.id}}" class="{% if c.unread %}context{% endif %} comment {% if standalone and level==1 %} mt-0{% endif %}{% if c.collapse_for_user(v) or (standalone and c.over_18 and not (v and v.over_18)) %} collapsed{% endif %}" style="border-left: 2px solid #{{c.author.namecolor}}; {% if c.unread %}padding: 10px 10px 10px !important;{% endif %}">
 
 	<span class="comment-collapse-desktop d-none d-md-block" {% if not c.unread %}style="border-left: 2px solid #{{c.author.namecolor}};"{% endif %} onclick="collapse_comment('{{c.id}}')"></span>
 	
diff --git a/files/templates/default.html b/files/templates/default.html
index 93228a4c2..dc1b526ff 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1161,7 +1161,7 @@
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/assets/js/general5.js"></script>
+<script src="/assets/js/general6.js"></script>
 
 <!-- ClipboardJS -->
 
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 2c4be249c..227db778f 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -145,6 +145,6 @@ We also have some custom hooks for mentioning users and subreddits. Note that th
 {% include "expanded_image_modal.html" %}
 {% include "expanded_video_modal.html" %}
 
-<script src="/assets/js/general5.js"></script>
+<script src="/assets/js/general6.js"></script>
 
 {% endblock %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 8cd51af28..c2b3947a1 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -130,7 +130,7 @@
 
 {% include "bootstrap.html" %}
 
-<script src="/assets/js/general5.js"></script>
+<script src="/assets/js/general6.js"></script>
 
 </body>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 5981a7114..8453efaea 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -254,7 +254,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/general5.js"></script>
+<script src="/assets/js/general6.js"></script>
 
 {% block onload %}{% endblock %}
 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 711af0a3f..44ed000c0 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -226,7 +226,7 @@
 	});
 </script>
 
-<script src="/assets/js/general5.js"></script>
+<script src="/assets/js/general6.js"></script>
 
 	{% block scripts %}
 	{% endblock %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 879743629..47176f0d6 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -225,7 +225,7 @@
 
 <!-- {{'SITE_NAME' | app_config}} JS -->
 
-<script src="/assets/js/general5.js"></script>
+<script src="/assets/js/general6.js"></script>
 
 </body>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 41baee217..eb546812d 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -144,7 +144,7 @@
 
 <!-- {{'SITE_NAME' | app_config}} JS -->
 
-<script src="/assets/js/general5.js"></script>
+<script src="/assets/js/general6.js"></script>
 
 </body>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 3563336e2..f2075a7cc 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -409,7 +409,7 @@
 
 		<!-- {{'SITE_NAME' | app_config}} JS -->
 
-		<script src="/assets/js/general5.js"></script>
+		<script src="/assets/js/general6.js"></script>
 
 		<!-- ClipboardJS -->