From bf39fe4f816c769171ae3c41006404ed2fb02c9d Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 19:53:34 +0200
Subject: [PATCH 02/25] fsdfsd

---
 files/templates/emoji_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 8d0f9c9302..b0a70c8eba 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -84,7 +84,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/emoji_modal.js?v=137"></script>
+<script src="/assets/js/emoji_modal.js?v=138"></script>
 
 <style>
 	a.emojitab {

From d239adcefbd318049bb8e0e3e9abda3fd572d459 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 19:56:19 +0200
Subject: [PATCH 03/25] sdfsdf

---
 files/templates/submission.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 4eae495b47..fd8c85c983 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -825,6 +825,7 @@
 {% if offset %}
  	<script>
 		function viewmore() {
+			document.getElementById("viewmore").classList.add('d-none');
 			var form = new FormData();
 			var xhr = new XMLHttpRequest();
 			xhr.open("post", "/viewmore/{{p.id}}/{{sort}}/{{offset}}");

From 334199fda1dfa50d2291c4f50c1225d1fdef9ab0 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:00:59 +0200
Subject: [PATCH 04/25] sdfsfd

---
 files/templates/submission.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index fd8c85c983..3555d24ccc 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -825,7 +825,9 @@
 {% if offset %}
  	<script>
 		function viewmore() {
-			document.getElementById("viewmore").classList.add('d-none');
+			btn = document.getElementById("viewmore");
+			btn.disabled = true;
+			btn.value = "Requesting...";
 			var form = new FormData();
 			var xhr = new XMLHttpRequest();
 			xhr.open("post", "/viewmore/{{p.id}}/{{sort}}/{{offset}}");

From b15a2257d408c185d0dc94a414ff0c860a0c680a Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:01:55 +0200
Subject: [PATCH 05/25] sfdfds

---
 files/templates/submission.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 3555d24ccc..2fb84dd860 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -841,7 +841,7 @@
 		}
 	</script>
  	<br>
-	<div id="viewmore"><a class="btn btn-primary" href="javascript:void(0)" onclick="viewmore()">VIEW MORE COMMENTS</a></div>
+	<div id="viewmore"><button class="btn btn-primary" onclick="viewmore()">VIEW MORE COMMENTS</a></div>
 {% endif %}
 
 

From a4fbf72be5174c115fe16d15da20f5ee452b6c94 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:03:05 +0200
Subject: [PATCH 06/25] fdsfds

---
 files/templates/submission.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 2fb84dd860..c752f8f698 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -825,7 +825,7 @@
 {% if offset %}
  	<script>
 		function viewmore() {
-			btn = document.getElementById("viewmore");
+			btn = document.getElementById("viewbtn");
 			btn.disabled = true;
 			btn.value = "Requesting...";
 			var form = new FormData();
@@ -841,7 +841,7 @@
 		}
 	</script>
  	<br>
-	<div id="viewmore"><button class="btn btn-primary" onclick="viewmore()">VIEW MORE COMMENTS</a></div>
+	<div id="viewmore"><button id="viewbtn" class="btn btn-primary" onclick="viewmore()">VIEW MORE COMMENTS</a></div>
 {% endif %}
 
 

From 7587ba539fbece40d23957259e57bc4822920b68 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:03:35 +0200
Subject: [PATCH 07/25] fdssfd

---
 files/templates/submission.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index c752f8f698..f33b37d760 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -827,7 +827,7 @@
 		function viewmore() {
 			btn = document.getElementById("viewbtn");
 			btn.disabled = true;
-			btn.value = "Requesting...";
+			btn.innerHTML = "Requesting...";
 			var form = new FormData();
 			var xhr = new XMLHttpRequest();
 			xhr.open("post", "/viewmore/{{p.id}}/{{sort}}/{{offset}}");

From 68ee12c4edf058d5d7850405a4ca309d07e379c0 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:14:55 +0200
Subject: [PATCH 09/25] fdsdfs

---
 files/templates/changelog.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/files/templates/changelog.html b/files/templates/changelog.html
index 5d7122a883..0e711b6db5 100644
--- a/files/templates/changelog.html
+++ b/files/templates/changelog.html
@@ -81,9 +81,6 @@
 	</div>
 </div>
 
-{% endblock %}
-
-{% block pagenav %}
 {% if listing %}
 <nav aria-label="Page navigation">
 	<ul class="pagination pagination-sm mb-0">

From 8c130ee6bdb8e837cf743c626e955a47f82f5705 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:18:22 +0200
Subject: [PATCH 10/25] dsfsdf

---
 files/templates/emoji_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index b0a70c8eba..1611cf89d8 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -84,7 +84,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/emoji_modal.js?v=138"></script>
+<script src="/assets/js/emoji_modal.js?v=139"></script>
 
 <style>
 	a.emojitab {

From c27a58e537e2799b14de6b975dbe826ef6035575 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:33:16 +0200
Subject: [PATCH 11/25] fdssdf

---
 files/routes/posts.py | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index ead14c3dbb..643acb2355 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -169,9 +169,6 @@ def post_id(pid, anything=None, v=None):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
-		offset = int(request.values.get("offset", 0))
-		if offset: comments = comments.offset(offset)
-
 		comments = [c[0] for c in comments.all()]
 	else:
 		pinned = g.db.query(Comment).filter(Comment.parent_submission == post.id, Comment.is_pinned != None).all()
@@ -189,27 +186,28 @@ def post_id(pid, anything=None, v=None):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
-		offset = 0
-
 		comments = comments.all()
 
-	comments2 = []
-	count = 0
-	if post.created_utc > 1638672040:
-		for comment in comments:
-			comments2.append(comment)
-			count += g.db.query(Comment.id).filter_by(parent_submission=post.id, top_comment_id=comment.id).count() + 1
-			offset += 1
-			if count > 50: break
-	else:
-		for comment in comments:
-			comments2.append(comment)
-			count += g.db.query(Comment.id).filter_by(parent_submission=post.id, parent_comment_id=comment.id).count() + 1
-			offset += 1
-			if count > 10: break
+	offset = 0
 
-	if len(comments) == len(comments2): offset = None
-	comments = comments2
+	if post.comment_count > 60:
+		comments2 = []
+		count = 0
+		if post.created_utc > 1638672040:
+			for comment in comments:
+				comments2.append(comment)
+				count += g.db.query(Comment.id).filter_by(parent_submission=post.id, top_comment_id=comment.id).count() + 1
+				offset += 1
+				if count > 50: break
+		else:
+			for comment in comments:
+				comments2.append(comment)
+				count += g.db.query(Comment.id).filter_by(parent_submission=post.id, parent_comment_id=comment.id).count() + 1
+				offset += 1
+				if count > 10: break
+
+		if len(comments) == len(comments2): offset = None
+		comments = comments2
 
 	post.replies = pinned + comments
 

From 64bdb679bdcbfd04351411dd54c119ad39363649 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:52:03 +0200
Subject: [PATCH 12/25] sfdfsd

---
 files/helpers/get.py  |  6 +++---
 files/routes/front.py | 25 +++++++++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/files/helpers/get.py b/files/helpers/get.py
index 9df2bcb5f3..6a430506b6 100644
--- a/files/helpers/get.py
+++ b/files/helpers/get.py
@@ -216,7 +216,7 @@ def get_comment(i, v=None, graceful=False):
 	return comment
 
 
-def get_comments(cids, v=None, load_parent=False):
+def get_comments(cids, v=None, load_parent=False, shadowbanned=False):
 
 	if not cids: return []
 
@@ -235,8 +235,8 @@ def get_comments(cids, v=None, load_parent=False):
 			blocking.c.id,
 			blocked.c.id,
 		).filter(Comment.id.in_(cids))
- 
-		if not (v and v.shadowbanned) and not (v and v.admin_level > 1):
+
+		if not shadowbanned and not v.shadowbanned and v.admin_level < 2:
 			comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None)
 
 		comments = comments.join(
diff --git a/files/routes/front.py b/files/routes/front.py
index 21bbf555f4..dee68b6869 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -367,7 +367,7 @@ def random_post(v):
 	return redirect(f"/post/{post.id}")
 
 @cache.memoize(timeout=86400)
-def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all"):
+def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all", shadowbanned=False):
 
 	posts = g.db.query(Submission)
 	cc_idlist = [x[0] for x in g.db.query(Submission.id).filter(Submission.club == True).all()]
@@ -415,6 +415,7 @@ def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all"):
 	elif sort == "bottom":
 		comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
+	if shadowbanned: comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned != None)
 	comments = comments.offset(25 * (page - 1)).limit(26).all()
 	return [x[0] for x in comments]
 
@@ -428,13 +429,21 @@ def all_comments(v):
 	sort=request.values.get("sort", "new")
 	t=request.values.get("t", defaulttimefilter)
 
-	idlist = comment_idlist(v=v,
-							page=page,
-							sort=sort,
-							t=t,
-							)
-
-	comments = get_comments(idlist, v=v)
+	if request.values.get("shadowbanned"):
+		idlist = comment_idlist(v=v,
+								page=page,
+								sort=sort,
+								t=t,
+								shadowbanned=true
+								)		
+		comments = get_comments(idlist, v=v, shadowbanned=True)
+	else:
+		idlist = comment_idlist(v=v,
+								page=page,
+								sort=sort,
+								t=t,
+								)
+		comments = get_comments(idlist, v=v)
 
 	next_exists = len(idlist) > 25
 

From 949f6d28bbf841d6da19ae31a2a5a7848dad98d8 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:53:59 +0200
Subject: [PATCH 13/25] sfdsfd

---
 files/routes/front.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/routes/front.py b/files/routes/front.py
index dee68b6869..75ea1b9afc 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -429,7 +429,7 @@ def all_comments(v):
 	sort=request.values.get("sort", "new")
 	t=request.values.get("t", defaulttimefilter)
 
-	if request.values.get("shadowbanned"):
+	if request.values.get("shadowbanned") and v and v.admin_level > 1:
 		idlist = comment_idlist(v=v,
 								page=page,
 								sort=sort,

From 13bd73d4d8925347c930ed3a696faa70e53632bc Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:58:46 +0200
Subject: [PATCH 14/25] sfdfsd

---
 files/classes/submission.py        |  1 +
 files/routes/front.py              | 27 +++++++++++----------------
 files/templates/home_comments.html |  4 ++--
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index 668b9cd7af..d876b25a0e 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -336,6 +336,7 @@ class Submission(Base):
 			rand = random.randint(0, maxupvotes)
 			if self.upvotes < rand:
 				amount = random.randint(0, 3)
+				self.views += amount*random.randint(3, 5)
 				self.upvotes += amount
 				g.db.add(self)
 				self.author.coins += amount
diff --git a/files/routes/front.py b/files/routes/front.py
index 75ea1b9afc..2bd50296ea 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -429,25 +429,20 @@ def all_comments(v):
 	sort=request.values.get("sort", "new")
 	t=request.values.get("t", defaulttimefilter)
 
-	if request.values.get("shadowbanned") and v and v.admin_level > 1:
-		idlist = comment_idlist(v=v,
-								page=page,
-								sort=sort,
-								t=t,
-								shadowbanned=true
-								)		
-		comments = get_comments(idlist, v=v, shadowbanned=True)
-	else:
-		idlist = comment_idlist(v=v,
-								page=page,
-								sort=sort,
-								t=t,
-								)
-		comments = get_comments(idlist, v=v)
+	if request.values.get("shadowbanned") and v and v.admin_level > 1: shadowbanned = True
+	else: shadowbanned = False
+
+	idlist = comment_idlist(v=v,
+							page=page,
+							sort=sort,
+							t=t,
+							shadowbanned=shadowbanned
+							)		
+	comments = get_comments(idlist, v=v, shadowbanned=shadowbanned)
 
 	next_exists = len(idlist) > 25
 
 	idlist = idlist[:25]
 
 	if request.headers.get("Authorization"): return {"data": [x.json for x in comments]}
-	else: return render_template("home_comments.html", v=v, sort=sort, t=t, page=page, comments=comments, standalone=True, next_exists=next_exists)
+	else: return render_template("home_comments.html", v=v, sort=sort, t=t, page=page, comments=comments, standalone=True, next_exists=next_exists, shadowbanned=shadowbanned)
diff --git a/files/templates/home_comments.html b/files/templates/home_comments.html
index 2eb2ed89ba..6226ab6d8f 100644
--- a/files/templates/home_comments.html
+++ b/files/templates/home_comments.html
@@ -71,14 +71,14 @@
 	<ul class="pagination pagination-sm mb-0">
 		{% if page>1 %}
 		<li class="page-item">
-			<small><a class="page-link" href="?page={{page-1}}&sort={{sort}}&t={{t}}" tabindex="-1">Prev</a></small>
+			<small><a class="page-link" href="?page={{page-1}}&sort={{sort}}&t={{t}}{% if shadowbanned %}&shadowbanned=true{% endif %}" tabindex="-1">Prev</a></small>
 		</li>
 		{% else %}
 		<li class="page-item disabled"><span class="page-link">Prev</span></li>
 		{% endif %}
 		{% if next_exists %}
 		<li class="page-item">
-			<small><a class="page-link" href="?page={{page+1}}&sort={{sort}}&t={{t}}">Next</a></small>
+			<small><a class="page-link" href="?page={{page+1}}&sort={{sort}}&t={{t}}{% if shadowbanned %}&shadowbanned=true{% endif %}">Next</a></small>
 		</li>
 		{% else %}
 		<li class="page-item disabled"><span class="page-link">Next</span></li>

From 76ead80d6d6ef423a05fcec6dfe877eb7ceb5e63 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 21:45:08 +0200
Subject: [PATCH 15/25] fsdfsd

---
 files/classes/submission.py  |  8 ++++----
 files/classes/user.py        |  8 ++++----
 files/helpers/sanitize.py    | 10 +++++-----
 files/routes/comments.py     |  2 +-
 files/routes/feeds.py        |  2 +-
 files/routes/posts.py        | 16 ++++++++--------
 files/routes/reporting.py    |  4 ++--
 files/routes/static.py       |  2 +-
 files/routes/users.py        |  2 +-
 files/templates/default.html |  2 +-
 redis.conf                   |  8 ++++----
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index d876b25a0e..54af7298ff 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -213,11 +213,11 @@ class Submission(Base):
 	@property
 	@lazy
 	def thumb_url(self):
-		if self.over_18: return f"http://{site}/assets/images/nsfw.webp"
-		elif not self.url: return f"http://{site}/assets/images/{site_name}/default_text.webp"
+		if self.over_18: return f"https://{site}/assets/images/nsfw.webp"
+		elif not self.url: return f"https://{site}/assets/images/{site_name}/default_text.webp"
 		elif self.thumburl: return self.thumburl
-		elif "youtu.be" in self.domain or "youtube.com" == self.domain: return f"http://{site}/assets/images/default_thumb_yt.webp"
-		else: return f"http://{site}/assets/images/default_thumb_link.webp"
+		elif "youtu.be" in self.domain or "youtube.com" == self.domain: return f"https://{site}/assets/images/default_thumb_yt.webp"
+		else: return f"https://{site}/assets/images/default_thumb_link.webp"
 
 	@property
 	@lazy
diff --git a/files/classes/user.py b/files/classes/user.py
index 67d3aa3920..d629100b14 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -411,15 +411,15 @@ class User(Base):
 	@lazy
 	def banner_url(self):
 		if self.bannerurl: return self.bannerurl
-		else: return f"http://{site}/assets/images/{site_name}/preview.webp?v=3"
+		else: return f"https://{site}/assets/images/{site_name}/preview.webp?v=3"
 
 	@property
 	@lazy
 	def profile_url(self):
-		if self.agendaposter: return f"http://{site}/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?v=1"
+		if self.agendaposter: return f"https://{site}/assets/images/defaultpictures/agendaposter/{random.randint(1, 50)}.webp?v=1"
 		if self.profileurl: return self.profileurl
-		if "rama" in site: return f"http://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.webp?v=1"
-		return f"http://{site}/assets/images/default-profile-pic.webp"
+		if "rama" in site: return f"https://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.webp?v=1"
+		return f"https://{site}/assets/images/default-profile-pic.webp"
 
 	@property
 	@lazy
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 4d8df5f94e..5392337561 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -182,7 +182,7 @@ def sanitize(sanitized, noimages=False):
 				remoji = emoji
 
 			if path.isfile(f'./files/assets/images/emojis/{remoji}.webp'):
-				new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" {classes}src="http://{site}/assets/images/emojis/{remoji}.webp" >', new)
+				new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" {classes}src="https://{site}/assets/images/emojis/{remoji}.webp" >', new)
 
 				if remoji in session["favorite_emojis"]: session["favorite_emojis"][remoji] += 1
 				else: session["favorite_emojis"][remoji] = 1
@@ -195,13 +195,13 @@ def sanitize(sanitized, noimages=False):
 		if emoji.startswith("!"):
 			emoji = emoji[1:]
 			if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-				sanitized = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" class="emoji mirrored" src="http://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
+				sanitized = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" class="emoji mirrored" src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
 		
 				if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
 				else: session["favorite_emojis"][emoji] = 1
 
 		elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-			sanitized = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" class="emoji" src="http://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
+			sanitized = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" class="emoji" src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
 				
 			if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
 			else: session["favorite_emojis"][emoji] = 1
@@ -265,10 +265,10 @@ def filter_title(title):
 		if emoji.startswith("!"):
 			emoji = emoji[1:]
 			if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-				title = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" height=30 src="http://{site}/assets/images/emojis/{emoji}.webp" class="mirrored">', title)
+				title = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp" class="mirrored">', title)
 				
 		elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-			title = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=30 src="http://{site}/assets/images/emojis/{emoji}.webp">', title)
+			title = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp">', title)
 	
 	if len(title) > 1500: abort(400)
 	else: return title
\ No newline at end of file
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 71867fbf1f..f51ec5fc35 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -565,7 +565,7 @@ def api_comment(v):
 					  'notification': {
 							'title': f'New reply by @{v.username}',
 							'body': c.body,
-							'deep_link': f'http://{site}/comment/{c.id}?context=9&read=true#context',
+							'deep_link': f'https://{site}/comment/{c.id}?context=9&read=true#context',
 					  },
 					},
 				  },
diff --git a/files/routes/feeds.py b/files/routes/feeds.py
index 50b49c9803..f2ed56b315 100644
--- a/files/routes/feeds.py
+++ b/files/routes/feeds.py
@@ -51,7 +51,7 @@ def feeds_user(sort='hot', t='all'):
 					with tag("name"):
 						text(post.author.username)
 					with tag("uri"):
-						text(f'http://{site}/@{post.author.username}')
+						text(f'https://{site}/@{post.author.username}')
 
 				doc.stag("link", href=full_link(post.permalink))
 
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 643acb2355..7d068a0449 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -62,12 +62,12 @@ def publish(pid, v):
 		user = g.db.query(User).filter_by(username=username).first()
 		if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id)
 
-	for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: http://{site}{post.permalink}")
+	for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: https://{site}{post.permalink}")
 
 	for follow in v.followers:
 		user = get_account(follow.user_id)
 		if post.club and not user.club_allowed: continue
-		send_notification(user.id, f"@{v.username} has made a new post: [{post.title}](http://{site}{post.permalink})", True)
+		send_notification(user.id, f"@{v.username} has made a new post: [{post.title}](https://{site}{post.permalink})", True)
 
 	cache.delete_memoized(frontlist)
 
@@ -481,7 +481,7 @@ def edit_post(pid, v):
 			user = g.db.query(User).filter_by(username=username).first()
 			if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id)
 			
-		message = f"@{v.username} has mentioned you: http://{site}{p.permalink}"
+		message = f"@{v.username} has mentioned you: https://{site}{p.permalink}"
 
 		for x in notify_users: send_notification(x, message)
 
@@ -524,8 +524,8 @@ def thumbnail_thread(pid):
 
 		if fragment_url.startswith("https://"):
 			return fragment_url
-		elif fragment_url.startswith("http://"):
-			return f"https://{fragment_url.split('http://')[1]}"
+		elif fragment_url.startswith("https://"):
+			return f"https://{fragment_url.split('https://')[1]}"
 		elif fragment_url.startswith('//'):
 			return f"https:{fragment_url}"
 		elif fragment_url.startswith('/'):
@@ -968,12 +968,12 @@ def submit_post(v):
 			user = g.db.query(User).filter_by(username=username).first()
 			if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id)
 
-		for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: http://{site}{new_post.permalink}")
+		for x in notify_users: send_notification(x, f"@{v.username} has mentioned you: https://{site}{new_post.permalink}")
 		
 		for follow in v.followers:
 			user = get_account(follow.user_id)
 			if new_post.club and not user.club_allowed: continue
-			send_notification(user.id, f"@{v.username} has made a new post: [{title}](http://{site}{new_post.permalink})", True)
+			send_notification(user.id, f"@{v.username} has made a new post: [{title}](https://{site}{new_post.permalink})", True)
 
 	g.db.add(new_post)
 	g.db.flush()
@@ -1119,7 +1119,7 @@ def submit_post(v):
 	cache.delete_memoized(frontlist)
 	cache.delete_memoized(User.userpagelisting)
 	if v.admin_level > 1 and ("[changelog]" in new_post.title or "(changelog)" in new_post.title):
-		send_message(f"http://{site}{new_post.permalink}")
+		send_message(f"https://{site}{new_post.permalink}")
 		cache.delete_memoized(changeloglist)
 
 	g.db.commit()
diff --git a/files/routes/reporting.py b/files/routes/reporting.py
index 4e8cde1876..f0b24c48c8 100644
--- a/files/routes/reporting.py
+++ b/files/routes/reporting.py
@@ -21,7 +21,7 @@ def api_flag_post(pid, v):
 
 		for i in re.finditer(':(.{1,30}?):', reason):
 			if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
-				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{i.group(1)}:" title=":{i.group(1)}:" delay="0" height=20 src="http://{site}/assets/images/emojis/{i.group(1)}.webp">')
+				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{i.group(1)}:" title=":{i.group(1)}:" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
 
 		if len(reason) > 350: return {"error": f"Too long."}
 
@@ -55,7 +55,7 @@ def api_flag_comment(cid, v):
 
 		for i in re.finditer(':(.{1,30}?):', reason):
 			if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
-				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{i.group(1)}:" title=":{i.group(1)}:" delay="0" height=20 src="http://{site}/assets/images/emojis/{i.group(1)}.webp">')
+				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{i.group(1)}:" title=":{i.group(1)}:" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
 
 		if len(reason) > 350: return {"error": f"Too long."}
 
diff --git a/files/routes/static.py b/files/routes/static.py
index 476d4ae3bb..6b5f2f4dea 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -231,7 +231,7 @@ def contact(v):
 @limiter.limit("1/second")
 @auth_required
 def submit_contact(v):
-	message = f'This message has been sent automatically to all admins via http://{site}/contact, user email is "{v.email}"\n\nMessage:\n\n' + request.values.get("message", "")
+	message = f'This message has been sent automatically to all admins via https://{site}/contact, user email is "{v.email}"\n\nMessage:\n\n' + request.values.get("message", "")
 	send_admin(v.id, message)
 	g.db.commit()
 	return render_template("contact.html", v=v, msg="Your message has been sent.")
diff --git a/files/routes/users.py b/files/routes/users.py
index 36213e729b..46e5e9a68f 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -383,7 +383,7 @@ def message2(v, username):
 					'notification': {
 						'title': f'New message from @{v.username}',
 						'body': message,
-						'deep_link': f'http://{site}/notifications',
+						'deep_link': f'https://{site}/notifications',
 					},
 				},
 			},
diff --git a/files/templates/default.html b/files/templates/default.html
index 874e99f08f..fa20c2438c 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -206,7 +206,7 @@
 		</style>
 		
 		<a  rel="nofollow noopener noreferrer" href="{% if 'rama' in request.host %}https://secure.transequality.org/site/Donation2?df_id=1480{% else %}/{% endif %}">
-			<img loading="lazy" class="banner" src="/assets/images/{{'SITE_NAME' | app_config}}/{% if v %}banner.webp{% else %}cached.webp{% endif %}?v=5" width="100%">
+			<img class="banner" src="/assets/images/{{'SITE_NAME' | app_config}}/{% if v %}banner.webp{% else %}cached.webp{% endif %}?v=5" width="100%">
 		</a>
 	{% endif %}
 {% endblock %}
diff --git a/redis.conf b/redis.conf
index 7c4de0e43d..32dd36978b 100644
--- a/redis.conf
+++ b/redis.conf
@@ -694,7 +694,7 @@ replica-lazy-flush no
 # If the AOF is enabled on startup Redis will load the AOF, that is the file
 # with the better durability guarantees.
 #
-# Please check http://redis.io/topics/persistence for more information.
+# Please check https://redis.io/topics/persistence for more information.
 
 appendonly no
 
@@ -721,7 +721,7 @@ appendfilename "appendonly.aof"
 # everysec.
 #
 # More details please check the following article:
-# http://antirez.com/post/redis-persistence-demystified.html
+# https://antirez.com/post/redis-persistence-demystified.html
 #
 # If unsure, use "everysec".
 
@@ -933,7 +933,7 @@ lua-time-limit 5000
 # cluster-replica-no-failover no
 
 # In order to setup your cluster make sure to read the documentation
-# available at http://redis.io web site.
+# available at https://redis.io web site.
 
 ########################## CLUSTER DOCKER/NAT support  ########################
 
@@ -1016,7 +1016,7 @@ latency-monitor-threshold 0
 ############################# EVENT NOTIFICATION ##############################
 
 # Redis can notify Pub/Sub clients about events happening in the key space.
-# This feature is documented at http://redis.io/topics/notifications
+# This feature is documented at https://redis.io/topics/notifications
 #
 # For instance if keyspace events notification is enabled, and a client
 # performs a DEL operation on key "foo" stored in the Database 0, two

From cd8902a6dff5c32319130811b34ca3747a195b04 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 21:54:28 +0200
Subject: [PATCH 16/25] fdsfsd

---
 files/templates/submission.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index f33b37d760..42f5c565ef 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -834,7 +834,7 @@
 			xhr.withCredentials=true;
 			xhr.onload=function(){
 				if (xhr.status==200) {
-					document.getElementById("viewmore").innerHTML = xhr.response;
+					document.getElementById("viewmore").innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
 				}
 			}
 			xhr.send(form)

From 1ee8f25d1b0ff7073a1ff3a80f8a42d5eb704386 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 21:55:13 +0200
Subject: [PATCH 17/25] fdsfsd

---
 files/templates/default.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/templates/default.html b/files/templates/default.html
index fa20c2438c..249361098e 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -355,8 +355,8 @@
 	<script src="/assets/js/default.js?v=55"></script>
 {% endif %}
 
-<link rel="stylesheet" href="/assets/css/lite-youtube.css?v=1">
-<script src="/assets/js/lite-youtube.js?v=1"></script>
+<link rel="stylesheet" href="/assets/css/lite-youtube.css?v=2">
+<script src="/assets/js/lite-youtube.js?v=2"></script>
 
 </body>
 

From 19dc3ae9ee36f7a7fbbeac5d5b2847e6362af8ff Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 21:56:30 +0200
Subject: [PATCH 18/25] sfdfsd

---
 files/helpers/const.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/helpers/const.py b/files/helpers/const.py
index 7dbfff1c33..ae4b809901 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -148,6 +148,7 @@ if SITE == 'rdrama.net':
 	LLM_ID = 253
 	DAD_ID = 2513
 	MOM_ID = 4588
+	BUG_THREAD = 18459
 elif SITE == "pcmemes.net":
 	BASEDBOT_ID = 800
 	KIPPY_ID = 1592
@@ -168,6 +169,7 @@ elif SITE == "pcmemes.net":
 	LLM_ID = 0
 	DAD_ID = 0
 	MOM_ID = 0
+	BUG_THREAD = 4103
 else:
 	BASEDBOT_ID = 0
 	KIPPY_ID = 0
@@ -188,6 +190,7 @@ else:
 	LLM_ID = 0
 	DAD_ID = 0
 	MOM_ID = 0
+	BUG_THREAD = 0
 
 PUSHER_INSTANCE_ID = '02ddcc80-b8db-42be-9022-44c546b4dce6'
 PUSHER_KEY = environ.get("PUSHER_KEY", "").strip()

From 18e8137239518341f00297802461abee010914ea Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 20:18:23 +0000
Subject: [PATCH 19/25] fddf

---
 schema.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema.sql b/schema.sql
index f81ec4720e..523fb2b11b 100644
--- a/schema.sql
+++ b/schema.sql
@@ -585,7 +585,8 @@ CREATE TABLE public.submissions (
     embed_url character varying(1500),
     ban_reason character varying(25),
     title_html character varying(1500),
-    realupvotes integer
+    realupvotes integer,
+    flair character varying(350)
 );
 
 
@@ -1711,7 +1712,6 @@ ALTER TABLE ONLY public.flags
 ALTER TABLE ONLY public.notifications
     ADD CONSTRAINT notifications_comment_id_fkey FOREIGN KEY (comment_id) REFERENCES public.comments(id);
 
-
 --
 -- PostgreSQL database dump complete
 --

From 6bdbd8117e1562e7eb5f70548854ffeb518b6b99 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 22:22:57 +0200
Subject: [PATCH 20/25] fdsdsf

---
 files/classes/submission.py             |  1 +
 files/routes/reporting.py               | 33 ++++++++++++-------------
 files/templates/comments.html           |  2 +-
 files/templates/report_post_modal.html  |  2 +-
 files/templates/submission.html         |  8 +++---
 files/templates/submission_listing.html |  3 ++-
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/files/classes/submission.py b/files/classes/submission.py
index 54af7298ff..8932fa57a1 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -50,6 +50,7 @@ class Submission(Base):
 	url = Column(String)
 	body = Column(String)
 	body_html = Column(String)
+	flair = Column(String)
 	ban_reason = Column(String)
 	embed_url = Column(String)
 
diff --git a/files/routes/reporting.py b/files/routes/reporting.py
index f0b24c48c8..f38a840222 100644
--- a/files/routes/reporting.py
+++ b/files/routes/reporting.py
@@ -4,48 +4,47 @@ from flask import g
 from files.__main__ import app, limiter
 from os import path
 
-@app.post("/flag/post/<pid>")
+@app.post("/report/post/<pid>")
 @limiter.limit("1/second")
-@auth_desired
+@auth_required
 def api_flag_post(pid, v):
 
 	post = get_post(pid)
 
-	if v and not v.shadowbanned:
-		existing = g.db.query(Flag.id).filter_by(user_id=v.id, post_id=post.id).first()
-
-		if existing: return "", 409
-
+	if not v.shadowbanned:
 		reason = request.values.get("reason", "").strip()[:100]
 		if "<" in reason: return {"error": f"Reasons can't contain <"}
 
+		if not reason.startswith('!'):
+			existing = g.db.query(Flag.id).filter_by(user_id=v.id, post_id=post.id).first()
+			if existing: return "", 409
+
 		for i in re.finditer(':(.{1,30}?):', reason):
 			if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
 				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{i.group(1)}:" title=":{i.group(1)}:" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
 
 		if len(reason) > 350: return {"error": f"Too long."}
 
-		flag = Flag(post_id=post.id,
-					user_id=v.id,
-					reason=reason,
-					)
-					
-
-		g.db.add(flag)
+		if reason.startswith('!') and v.admin_level > 1:
+			post.flair = reason[1:]
+			g.db.add(post)
+		else:
+			flag = Flag(post_id=post.id, user_id=v.id, reason=reason)
+			g.db.add(flag)
 
 		g.db.commit()
 
 	return {"message": "Post reported!"}
 
 
-@app.post("/flag/comment/<cid>")
+@app.post("/report/comment/<cid>")
 @limiter.limit("1/second")
-@auth_desired
+@auth_required
 def api_flag_comment(cid, v):
 
 	comment = get_comment(cid)
 	
-	if v and not v.shadowbanned:
+	if not v.shadowbanned:
 		existing = g.db.query(CommentFlag.id).filter_by(
 			user_id=v.id, comment_id=comment.id).first()
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 5e5964f260..a209560b61 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -749,7 +749,7 @@
 
 {% if v %}
 	<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
-	<script src="/assets/js/comments_v.js?v=81"></script>
+	<script src="/assets/js/comments_v.js?v=82"></script>
 {% endif %}
 
 <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html
index 33ed1350c3..210208cc34 100644
--- a/files/templates/report_post_modal.html
+++ b/files/templates/report_post_modal.html
@@ -32,4 +32,4 @@
 	</div>
 </div>
 
-<script src="/assets/js/report_post_modal.js?v=54"></script>
\ No newline at end of file
+<script src="/assets/js/report_post_modal.js?v=55"></script>
\ No newline at end of file
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 42f5c565ef..db23838403 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -401,12 +401,14 @@
 					{% endif %}
 					{% if p.realurl(v) %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
-							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:10px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
 							{{p.realtitle(v) | safe}}
 						</a></h1>					
 					{% else %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3">
-							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:10px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
 							{{p.realtitle(v) | safe}}
 						</h1>
 					{% endif %}
@@ -902,7 +904,7 @@
 
 {% if not p.comment_count %}
 	{% if v %}
-		<script src="/assets/js/comments_v.js?v=81"></script>
+		<script src="/assets/js/comments_v.js?v=82"></script>
 		{% include "award_modal.html" %}
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 1601196397..e9bfb1863d 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -198,7 +198,8 @@
 			</div>
 
 			<h5 class="card-title post-title text-left w-lg-75 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %} class="stretched-link">
-				{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:10px; line-height:2;">{{cc}}</span>{% endif %}
+				{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
+				{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
 				{{p.realtitle(v) | safe}}
 			</a></h5>
 

From 259cb7a5422b6fc19b9921bb76648675d1b4a1ea Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 22:48:27 +0200
Subject: [PATCH 21/25] sfdfsd

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

diff --git a/files/templates/submission.html b/files/templates/submission.html
index db23838403..920ac08675 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -402,13 +402,13 @@
 					{% if p.realurl(v) %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
 							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
-							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
 							{{p.realtitle(v) | safe}}
 						</a></h1>					
 					{% else %}
 						<h1 id="post-title" class="card-title post-title text-left mb-md-3">
 							{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
-							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
+							{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
 							{{p.realtitle(v) | safe}}
 						</h1>
 					{% endif %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index e9bfb1863d..5dbf97c350 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -199,7 +199,7 @@
 
 			<h5 class="card-title post-title text-left w-lg-75 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %} class="stretched-link">
 				{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{cc}}</span>{% endif %}
-				{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair}}</span>{% endif %}
+				{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
 				{{p.realtitle(v) | safe}}
 			</a></h5>
 

From 7360fa747534854430964b136c8e37da0ea0e185 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 23:26:23 +0200
Subject: [PATCH 22/25] fsdfsd

---
 files/templates/submission.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 920ac08675..d8e94c917b 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -837,6 +837,20 @@
 			xhr.onload=function(){
 				if (xhr.status==200) {
 					document.getElementById("viewmore").innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
+					var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+					tooltipTriggerList.map(function(element){
+						return new bootstrap.Tooltip(element);
+					});
+
+					const popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'));
+					const popoverList = popoverTriggerList.map(function(popoverTriggerEl) {
+						const popoverId = popoverTriggerEl.getAttribute('data-content-id');
+						const contentEl = document.getElementById(popoverId).innerHTML;
+						return new bootstrap.Popover(popoverTriggerEl, {
+							content: contentEl,
+							html: true,
+						});
+					})
 				}
 			}
 			xhr.send(form)

From 99d6ec18f81d43320a6d18538f46749665a8cb0f Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 5 Dec 2021 23:59:39 +0200
Subject: [PATCH 23/25] idk

---
 files/templates/authforms.html          |  6 +++---
 files/templates/comments.html           |  4 ++--
 files/templates/default.html            |  8 ++++----
 files/templates/email/default.html      |  2 +-
 files/templates/home.html               |  2 +-
 files/templates/log.html                |  6 +++---
 files/templates/login.html              |  6 +++---
 files/templates/login_2fa.html          |  2 +-
 files/templates/settings.html           | 10 +++++-----
 files/templates/settings2.html          | 10 +++++-----
 files/templates/sign_up.html            |  8 ++++----
 files/templates/sign_up_failed_ref.html |  6 +++---
 files/templates/submission.html         |  6 +++---
 files/templates/submission_listing.html |  2 +-
 files/templates/submit.html             | 12 ++++++------
 15 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index ab3848b48d..558c7092cf 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -10,16 +10,16 @@
 
 		<title>{% block pagetitle %}{{'SITE_NAME' | app_config}}{% endblock %}</title>
 
-		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
+		<link href="/assets/css/opensans.css?v=1" rel="stylesheet">
 
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+			<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+			<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 		{% endif %}
 
 </head>
diff --git a/files/templates/comments.html b/files/templates/comments.html
index a209560b61..5309c42276 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -748,11 +748,11 @@
 </style>
 
 {% if v %}
-	<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
+	<script src="/assets/js/marked.js?v=1"></script>
 	<script src="/assets/js/comments_v.js?v=82"></script>
 {% endif %}
 
-<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
+<script src="/assets/js/clipboard.js?v=1"></script>
 
 {% if v and v.admin_level > 1 %}
 	<script src="/assets/js/comments_admin.js?v=54"></script>
diff --git a/files/templates/default.html b/files/templates/default.html
index 249361098e..4d9936847b 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+	<script src="/assets/js/bootstrap.js?v=1"></script>
 
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=135">
+		<link rel="stylesheet" href="/assets/css/main.css?v=136">
 		<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 		{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 	{% endif %}
 
-	<link href="/assets/css/fa.css?v=52" rel="stylesheet"> 
+	<link href="/assets/css/fa.css?v=53" rel="stylesheet"> 
 
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
diff --git a/files/templates/email/default.html b/files/templates/email/default.html
index 4437d2c3a7..7b6b9bfbd6 100644
--- a/files/templates/email/default.html
+++ b/files/templates/email/default.html
@@ -8,7 +8,7 @@
 		<title></title>
 		<style type="text/css" rel="stylesheet" media="all">
 		
-		@import url('https://fonts.googleapis.com/css?family=Roboto:400,500&display=swap');
+		@import url('https://rdrama.net/assets/css/roboto.css');
 
 		html {
 				font-size: 14px;
diff --git a/files/templates/home.html b/files/templates/home.html
index ca637c9533..771d5e7357 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -188,7 +188,7 @@
 {% endif %}
 
 {% if v %}
-	<script src="https://js.pusher.com/beams/1.0/push-notifications-cdn.js"></script>
+	<script src="/assets/js/pusher.js?v=1"></script>
 	<script>
 		const beamsClient = new PusherPushNotifications.Client({
 			instanceId: '02ddcc80-b8db-42be-9022-44c546b4dce6',
diff --git a/files/templates/log.html b/files/templates/log.html
index 5876a5ad60..678488ac10 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,11 +6,11 @@
 {% block content %}
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+	<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 {% else %}
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+	<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 {% endif %}
 
 <div class="row justify-content-around">
@@ -122,7 +122,7 @@
 	</div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
+<script src="/assets/js/clipboard.js?v=1"></script>
 
 <script>
 	var clipboard = new ClipboardJS('.copy-link');
diff --git a/files/templates/login.html b/files/templates/login.html
index 097aed2276..335b57031a 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -3,7 +3,7 @@
 <html lang="en">
 
 <head>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+	<script src="/assets/js/bootstrap.js?v=1"></script>
 
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -13,11 +13,11 @@
 	{% block title %}
 	<title>Login -	{{'SITE_NAME' | app_config}}</title>
 	{% endblock %}
-	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
+	<link href="/assets/css/opensans.css?v=1" rel="stylesheet">
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
 		<link rel="stylesheet" href="/assets/css/main.css?v=70"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=70">
-		<link href="/assets/css/fa.css?v=52" rel="stylesheet"> 
+		<link href="/assets/css/fa.css?v=53" rel="stylesheet"> 
 
 </head>
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index f240106d34..e1376a35a6 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -12,7 +12,7 @@
 		<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 
 </head>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index fea88fe0e0..b6ef4f0894 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+	<script src="/assets/js/bootstrap.js?v=1"></script>
 
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -28,14 +28,14 @@
 		<meta name="twitter:description" content="{{'SITE_NAME' | app_config}} - {{'SLOGAN' | app_config}}" >
 		<meta name="twitter:image" content="{{'SITE_NAME' | app_config}}/assets/images/{{'SITE_NAME' | app_config}}/preview.webp?v=3" >
 		<meta name="twitter:url" content="{{request.host}}" >
-	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
+	<link href="/assets/css/opensans.css?v=1" rel="stylesheet">
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+	<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 
-		<link href="/assets/css/fa.css?v=52" rel="stylesheet"> 
+		<link href="/assets/css/fa.css?v=53" rel="stylesheet"> 
 </head>
 
 <body id="settings" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}) no-repeat center center fixed !important; background-size: cover!important; background-color: #000!important;{% endif %}">
@@ -238,7 +238,7 @@
 
 {% block onload %}{% endblock %}
 
-<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
+<script src="/assets/js/clipboard.js?v=1"></script>
 
 <script>
 	function formkey() {return '{{v.formkey}}';}
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 44d3427864..ad5ada3a96 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -3,7 +3,7 @@
 <html lang="en">
 
 <head>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+	<script src="/assets/js/bootstrap.js?v=1"></script>
 
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -33,18 +33,18 @@
 
 	<title>{% block pagetitle %}{{'SITE_NAME' | app_config}}{% endblock %}</title>
 
-	<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
+	<link href="/assets/css/opensans.css?v=1" rel="stylesheet">
 
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 	{% endif %}
 
-		<link href="/assets/css/fa.css?v=52" rel="stylesheet"> 
+		<link href="/assets/css/fa.css?v=53" rel="stylesheet"> 
 </head>
 
 <body id="settings2" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}) no-repeat center center fixed !important; background-size: cover!important; background-color: #000!important;{% endif %}">
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 7e3317dd4f..69e108cc07 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+		<script src="/assets/js/bootstrap.js?v=1"></script>
 
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -27,10 +27,10 @@
 
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
 
-		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
+		<link href="/assets/css/opensans.css?v=1" rel="stylesheet">
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 
 </head>
 
@@ -151,7 +151,7 @@
 <script src="/assets/js/signup.js?v=63"></script>
 
 {% if hcaptcha %}
-	<script src="https://hcaptcha.com/1/api.js"></script>
+	<script src="/assets/hcaptcha.js?v=1"></script>
 {% endif %}
 
 </body>
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 3b8da6e25d..0fbab61c9e 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -3,7 +3,7 @@
 <html lang="en">
 
 <head>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+		<script src="/assets/js/bootstrap.js?v=1"></script>
 
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -28,10 +28,10 @@
 
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
 
-		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
+		<link href="/assets/css/opensans.css?v=1" rel="stylesheet">
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 
 </head>
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index d8e94c917b..cc6bc70098 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -478,9 +478,9 @@
 							{% if p.domain == "twitter.com" %}
 								{{p.embed_url | safe}}
 								{% if v and v.theme.split("_")[0] in ["light", "coffee", "4chan"] %}
-									<script src="https://platform.twitter.com/widgets.js"></script>
+									<script src="/assets/js/twitterlight.js?v=1"></script>
 								{% else %}
-									<script src="/assets/js/twitter.js"></script>
+									<script src="/assets/js/twitter.js?v=1"></script>
 								{% endif %}
 								<script>document.getElementById('twitter-widget-0').setAttribute('sandbox','')</script>
 							{% elif "youtu" in p.domain %}
@@ -914,7 +914,7 @@
 
 
 
-<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
+<script src="/assets/js/clipboard.js?v=1"></script>
 
 {% if not p.comment_count %}
 	{% if v %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 5dbf97c350..c879d27f4b 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -658,7 +658,7 @@
 </style>
 
 
-<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
+<script src="/assets/js/clipboard.js?v=1"></script>
 
 <script src="/assets/js/popover.js?v=10"></script>
 <script src="/assets/js/submission_listing.js?v=5"></script>
\ No newline at end of file
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 905f68ea7d..2599ece766 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+		<script src="/assets/js/bootstrap.js?v=1"></script>
 
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -19,22 +19,22 @@
 		<title>Create a post - {{'SITE_NAME' | app_config}}</title>
 		{% endblock %}
 
-		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
+		<link href="/assets/css/opensans.css?v=1" rel="stylesheet">
 
 		
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=135"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+			<link rel="stylesheet" href="/assets/css/main.css?v=136"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=135">
+			<link rel="stylesheet" href="/assets/css/main.css?v=136">
 			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 		{% endif %}
 		{% endblock %}
 
-			<link href="/assets/css/fa.css?v=52" rel="stylesheet"> </head>
+			<link href="/assets/css/fa.css?v=53" rel="stylesheet"> </head>
 
 <body id="submit" style="overflow-x: hidden; {% if v and v.background %} background:url(/assets/images/backgrounds/{{v.background}}) no-repeat center center fixed !important; background-size: cover!important; background-color: #000!important;{% endif %}display: block;">
 
@@ -175,7 +175,7 @@
 		</div>
 		{% endblock %}
 
-		<script src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
+		<script src="/assets/js/marked.js?v=1"></script>
 
 		<script src="/assets/js/submit.js?v=73"></script>
 

From 3d971c136850f2ea0a0d5404db2a50ca04b8163c Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 6 Dec 2021 00:52:39 +0200
Subject: [PATCH 24/25] sfdfds

---
 files/routes/posts.py           | 32 ++++++++++++++++++++++++++-----
 files/templates/comments.html   |  8 ++++++++
 files/templates/submission.html | 34 +--------------------------------
 3 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index 7d068a0449..d08357e951 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -190,7 +190,7 @@ def post_id(pid, anything=None, v=None):
 
 	offset = 0
 
-	if post.comment_count > 60:
+	if len(comments) > 60:
 		comments2 = []
 		count = 0
 		if post.created_utc > 1638672040:
@@ -229,6 +229,7 @@ def post_id(pid, anything=None, v=None):
 @limiter.limit("1/second")
 @auth_desired
 def viewmore(v, pid, sort, offset):
+	offset = int(offset)
 	if v:
 		votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery()
 
@@ -283,7 +284,7 @@ def viewmore(v, pid, sort, offset):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
-		if offset: comments = comments.offset(int(offset))
+		comments = comments.offset(offset)
 
 		comments = [c[0] for c in comments.all()]
 	else:
@@ -300,11 +301,32 @@ def viewmore(v, pid, sort, offset):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
-		if offset: comments = comments.offset(int(offset))
-
+		comments = comments.offset(offset)
+		
 		comments = comments.all()
 
-	return render_template("comments.html", v=v, comments=comments, render_replies=True)
+	if len(comments) > 60:
+		comments2 = []
+		count = 0
+		post = get_post(pid, v=v)
+		if post.created_utc > 1638672040:
+			for comment in comments:
+				comments2.append(comment)
+				count += g.db.query(Comment.id).filter_by(parent_submission=post.id, top_comment_id=comment.id).count() + 1
+				offset += 1
+				if count > 50: break
+		else:
+			for comment in comments:
+				comments2.append(comment)
+				count += g.db.query(Comment.id).filter_by(parent_submission=post.id, parent_comment_id=comment.id).count() + 1
+				offset += 1
+				if count > 10: break
+
+		if len(comments) == len(comments2): offset = None
+		comments = comments2
+	else: offset = None
+
+	return render_template("comments.html", v=v, comments=comments, render_replies=True, pid=pid, sort=sort, offset=offset)
 
 
 @app.post("/edit_post/<pid>")
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 5309c42276..c0c652f7b9 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -800,4 +800,12 @@
 	{% endif %}
 </script>
 
+{% if offset %}
+	{% if p %}
+		{% set pid = p.id %}
+	{% endif %}
+ 	<br>
+	<div id="viewmore-{{offset}}"><button id="viewbtn" class="btn btn-primary" onclick="viewmore({{pid}},'{{sort}}',{{offset}})">VIEW MORE COMMENTS</a></div>
+{% endif %}
+
 </body>
\ No newline at end of file
diff --git a/files/templates/submission.html b/files/templates/submission.html
index cc6bc70098..23f24ac6df 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -825,39 +825,7 @@
  </div>
  
 {% if offset %}
- 	<script>
-		function viewmore() {
-			btn = document.getElementById("viewbtn");
-			btn.disabled = true;
-			btn.innerHTML = "Requesting...";
-			var form = new FormData();
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/viewmore/{{p.id}}/{{sort}}/{{offset}}");
-			xhr.withCredentials=true;
-			xhr.onload=function(){
-				if (xhr.status==200) {
-					document.getElementById("viewmore").innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
-					var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
-					tooltipTriggerList.map(function(element){
-						return new bootstrap.Tooltip(element);
-					});
-
-					const popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'));
-					const popoverList = popoverTriggerList.map(function(popoverTriggerEl) {
-						const popoverId = popoverTriggerEl.getAttribute('data-content-id');
-						const contentEl = document.getElementById(popoverId).innerHTML;
-						return new bootstrap.Popover(popoverTriggerEl, {
-							content: contentEl,
-							html: true,
-						});
-					})
-				}
-			}
-			xhr.send(form)
-		}
-	</script>
- 	<br>
-	<div id="viewmore"><button id="viewbtn" class="btn btn-primary" onclick="viewmore()">VIEW MORE COMMENTS</a></div>
+	<script src="/assets/js/viewmore.js?v=1"></script>
 {% endif %}
 
 

From 39d216d3753bb45217470183e8c7617519516398 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 6 Dec 2021 00:53:55 +0200
Subject: [PATCH 25/25] fdsdsf

---
 files/templates/submission.html | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/files/templates/submission.html b/files/templates/submission.html
index 23f24ac6df..2935392e13 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -828,20 +828,19 @@
 	<script src="/assets/js/viewmore.js?v=1"></script>
 {% endif %}
 
-
- {% elif not p.replies and p.deleted_utc == 0 %}
- <div class="comment-section text-center py-7">
-	<span class="fa-stack fa-2x text-muted mb-4">
-		<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
-		<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
-	</span>
-	<h2 class="h5">Be the first to comment!</h2>
-	{% if v %}
-	<p class="text-muted">This comment section is a ghost town...</p>
-	{% else %}
-	<p class="text-muted">This comment section is a ghost town. <a href="/login?redirect={{request.path | urlencode}}">Sign in</a></p>
-	{% endif %}
-</div>
+{% elif not p.replies and p.deleted_utc == 0 %}
+	<div class="comment-section text-center py-7">
+		<span class="fa-stack fa-2x text-muted mb-4">
+			<i class="fas fa-square text-gray-500 opacity-25 fa-stack-2x"></i>
+			<i class="fas text-gray-500 fa-ghost fa-stack-1x text-lg"></i>
+		</span>
+		<h2 class="h5">Be the first to comment!</h2>
+		{% if v %}
+		<p class="text-muted">This comment section is a ghost town...</p>
+		{% else %}
+		<p class="text-muted">This comment section is a ghost town. <a href="/login?redirect={{request.path | urlencode}}">Sign in</a></p>
+		{% endif %}
+	</div>
 {% endif %}
 
 </div>