From b7522a5960c14325d74abadbd72f6190e9e2acdf Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 3 Dec 2021 20:10:24 +0200
Subject: [PATCH] sdffsd

---
 files/classes/user.py                   |  6 +-
 files/routes/front.py                   |  4 +-
 files/routes/settings.py                | 15 +++--
 files/templates/award_modal.html        |  2 +-
 files/templates/comments.html           | 84 ++++++++++++++++++++++++-
 files/templates/default.html            |  2 +-
 files/templates/login.html              |  2 +-
 files/templates/settings2.html          |  2 +-
 files/templates/sign_up.html            |  2 +-
 files/templates/sign_up_failed_ref.html |  2 +-
 files/templates/submission.html         | 77 +++++++++++++++++++++++
 files/templates/submission_listing.html | 80 +++++++++++++++++++++++
 files/templates/submit.html             |  4 +-
 13 files changed, 265 insertions(+), 17 deletions(-)

diff --git a/files/classes/user.py b/files/classes/user.py
index 08dafb8db..79031f88a 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -15,7 +15,7 @@ from .clients import *
 from files.__main__ import Base, cache
 from files.helpers.security import *
 import random
-from os import environ
+from os import environ, remove
 
 site = environ.get("DOMAIN").strip()
 site_name = environ.get("SITE_NAME").strip()
@@ -472,6 +472,10 @@ class User(Base):
 			ban_time = int(time.time()) + (days * 86400)
 			self.unban_utc = ban_time
 		else:
+			if self.highres and '/images/' in self.highres: remove('/images/' + self.highres.split('/images/')[1])
+			if self.profileurl and '/images/' in self.profileurl: remove('/images/' + self.profileurl.split('/images/')[1])
+			if self.bannerurl and '/images/' in self.bannerurl: remove('/images/' + self.bannerurl.split('/images/')[1])
+
 			self.bannerurl = None
 			self.profileurl = None
 			if self.discord_id: remove_user(self)
diff --git a/files/routes/front.py b/files/routes/front.py
index 93fb90588..21bbf555f 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -156,9 +156,11 @@ def front_all(v):
 
 		if v.agendaposter_expires_utc and v.agendaposter_expires_utc < time.time():
 			v.agendaposter_expires_utc = 0
-			v.agendaposter = False
+			v.agendaposter = None
 			send_notification(v.id, "Your agendaposter theme has expired!")
 			g.db.add(v)
+			badge = v.has_badge(26)
+			if badge: g.db.delete(badge)
 			g.db.commit()
 
 		if v.flairchanged and v.flairchanged < time.time():
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 9244820a1..0401c2108 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -761,6 +761,10 @@ def settings_images_banner(v):
 @auth_required
 @validate_formkey
 def settings_delete_profile(v):
+
+	if v.highres and '/images/' in v.highres: os.remove('/images/' + v.highres.split('/images/')[1])
+	if v.profileurl and '/images/' in v.profileurl: os.remove('/images/' + v.profileurl.split('/images/')[1])
+
 	v.highres = None
 	v.profileurl = None
 	g.db.add(v)
@@ -774,12 +778,13 @@ def settings_delete_profile(v):
 @validate_formkey
 def settings_delete_banner(v):
 
-	v.bannerurl = None
-	g.db.add(v)
-	g.db.commit()
+	if v.bannerurl:
+		if '/images/' in v.bannerurl: os.remove('/images/' + v.bannerurl.split('/images/')[1])
+		v.bannerurl = None
+		g.db.add(v)
+		g.db.commit()
 
-	return render_template("settings_profile.html", v=v,
-						   msg="Banner successfully removed.")
+	return render_template("settings_profile.html", v=v,  msg="Banner successfully removed.")
 
 
 @app.get("/settings/blocks")
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index a75cd5291..ea77077ab 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -36,7 +36,7 @@
 	</div>
 </div>
 
-<script defer src="/assets/js/award_modal.js?v=57"></script>
+<script defer src="/assets/js/award_modal.js?v=58"></script>
 
 <style>
 	.awards-wrapper input[type="radio"] {
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 6c8e60533..4d16598d6 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -1,3 +1,83 @@
+{% if v %}
+	<script>
+		function vote(type, id, dir) {
+			var upvote = document.getElementById(type + '-' + id + '-up');
+			var downvote = document.getElementById(type + '-' + id + '-down');
+			var scoretext = document.getElementById(type + '-score-' + id);
+
+			var score = Number(scoretext.textContent);
+
+			if (dir == "1") {
+				if (upvote.classList.contains('active')) {
+					upvote.classList.remove('active')
+					scoretext.textContent = score - 1
+					votedirection = "0"
+				} else if (downvote.classList.contains('active')) {
+					upvote.classList.add('active')
+					downvote.classList.remove('active')
+					scoretext.textContent = score + 2
+					votedirection = "1"
+				} else {
+					upvote.classList.add('active')
+					scoretext.textContent = score + 1
+					votedirection = "1"
+				}
+
+				if (upvote.classList.contains('active')) {
+					scoretext.classList.add('score-up')
+					scoretext.classList.remove('score-down')
+					scoretext.classList.remove('score')
+				} else if (downvote.classList.contains('active')) {
+					scoretext.classList.add('score-down')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score')
+				} else {
+					scoretext.classList.add('score')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score-down')
+				}
+			}
+			else {
+				if (downvote.classList.contains('active')) {
+					downvote.classList.remove('active')
+					scoretext.textContent = score + 1
+					votedirection = "0"
+				} else if (upvote.classList.contains('active')) {
+					downvote.classList.add('active')
+					upvote.classList.remove('active')
+					scoretext.textContent = score - 2
+					votedirection = "-1"
+				} else {
+					downvote.classList.add('active')
+					scoretext.textContent = score - 1
+					votedirection = "-1"
+				}
+
+				if (upvote.classList.contains('active')) {
+					scoretext.classList.add('score-up')
+					scoretext.classList.remove('score-down')
+					scoretext.classList.remove('score')
+				} else if (downvote.classList.contains('active')) {
+					scoretext.classList.add('score-down')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score')
+				} else {
+					scoretext.classList.add('score')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score-down')
+				}
+			}
+
+			var xhr = new XMLHttpRequest();
+			xhr.open("POST", "/vote/" + type.replace('-mobile','') + "/" + id + "/" + votedirection, true);
+			var form = new FormData()
+			form.append("formkey", formkey());
+			xhr.withCredentials=true;
+			xhr.send(form);
+		}
+	</script>
+{% endif %}
+
 <style>
 	html {
 		scroll-padding-top: 75px;
@@ -327,8 +407,8 @@
 								<input id="file-edit-reply-{{c.id}}" type="file" name="file" accept="image/*" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} onchange="document.getElementById('filename-edit-reply-{{c.id}}').innerHTML='image';" hidden>
 							</label>
 						</div>
-						<a href="javascript:void(0)" form="comment-edit-form-{{c.id}}" class="btn btn-primary ml-2 fl-r" onclick="comment_edit('{{c.id}}')">Save Edit</a> 
-						<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">Cancel</a> 
+						<a href="javascript:void(0)" form="comment-edit-form-{{c.id}}" class="btn btn-primary ml-2 fl-r commentmob" onclick="comment_edit('{{c.id}}')">Save Edit</a> 
+						<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>
diff --git a/files/templates/default.html b/files/templates/default.html
index d6342be32..20ca55d2f 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
diff --git a/files/templates/login.html b/files/templates/login.html
index 07ac140ab..9cec011df 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -114,7 +114,7 @@
 		</div>
 </div>
 
-<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 </body>
 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 5c7c63857..0e336d142 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -168,7 +168,7 @@
 {% block scripts %}
 {% endblock %}
 
-<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 <script>
 	function formkey() {return '{{v.formkey}}';}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index d9edfff6b..c5968ca91 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -146,7 +146,7 @@
 		</div>
 </div>
 
-<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 <script defer src="/assets/js/signup.js?v=63"></script>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 99640c9aa..568a96c8d 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -96,7 +96,7 @@
 		</div>
 </div>
 
-<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 </body>
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 08e42ec3e..429f465f1 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -895,6 +895,83 @@
 	</script>
 
 	{% if v %}
+		<script>
+			function vote(type, id, dir) {
+				var upvote = document.getElementById(type + '-' + id + '-up');
+				var downvote = document.getElementById(type + '-' + id + '-down');
+				var scoretext = document.getElementById(type + '-score-' + id);
+
+				var score = Number(scoretext.textContent);
+
+				if (dir == "1") {
+					if (upvote.classList.contains('active')) {
+						upvote.classList.remove('active')
+						scoretext.textContent = score - 1
+						votedirection = "0"
+					} else if (downvote.classList.contains('active')) {
+						upvote.classList.add('active')
+						downvote.classList.remove('active')
+						scoretext.textContent = score + 2
+						votedirection = "1"
+					} else {
+						upvote.classList.add('active')
+						scoretext.textContent = score + 1
+						votedirection = "1"
+					}
+
+					if (upvote.classList.contains('active')) {
+						scoretext.classList.add('score-up')
+						scoretext.classList.remove('score-down')
+						scoretext.classList.remove('score')
+					} else if (downvote.classList.contains('active')) {
+						scoretext.classList.add('score-down')
+						scoretext.classList.remove('score-up')
+						scoretext.classList.remove('score')
+					} else {
+						scoretext.classList.add('score')
+						scoretext.classList.remove('score-up')
+						scoretext.classList.remove('score-down')
+					}
+				}
+				else {
+					if (downvote.classList.contains('active')) {
+						downvote.classList.remove('active')
+						scoretext.textContent = score + 1
+						votedirection = "0"
+					} else if (upvote.classList.contains('active')) {
+						downvote.classList.add('active')
+						upvote.classList.remove('active')
+						scoretext.textContent = score - 2
+						votedirection = "-1"
+					} else {
+						downvote.classList.add('active')
+						scoretext.textContent = score - 1
+						votedirection = "-1"
+					}
+
+					if (upvote.classList.contains('active')) {
+						scoretext.classList.add('score-up')
+						scoretext.classList.remove('score-down')
+						scoretext.classList.remove('score')
+					} else if (downvote.classList.contains('active')) {
+						scoretext.classList.add('score-down')
+						scoretext.classList.remove('score-up')
+						scoretext.classList.remove('score')
+					} else {
+						scoretext.classList.add('score')
+						scoretext.classList.remove('score-up')
+						scoretext.classList.remove('score-down')
+					}
+				}
+
+				var xhr = new XMLHttpRequest();
+				xhr.open("POST", "/vote/" + type.replace('-mobile','') + "/" + id + "/" + votedirection, true);
+				var form = new FormData()
+				form.append("formkey", formkey());
+				xhr.withCredentials=true;
+				xhr.send(form);
+			}
+		</script>
 		<script defer src="/assets/js/comments_v.js?v=73"></script>
 		{% include "award_modal.html" %}
 		{% include "emoji_modal.html" %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index d1cfb0d4f..62e715286 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -1,3 +1,83 @@
+{% if v %}
+	<script>
+		function vote(type, id, dir) {
+			var upvote = document.getElementById(type + '-' + id + '-up');
+			var downvote = document.getElementById(type + '-' + id + '-down');
+			var scoretext = document.getElementById(type + '-score-' + id);
+
+			var score = Number(scoretext.textContent);
+
+			if (dir == "1") {
+				if (upvote.classList.contains('active')) {
+					upvote.classList.remove('active')
+					scoretext.textContent = score - 1
+					votedirection = "0"
+				} else if (downvote.classList.contains('active')) {
+					upvote.classList.add('active')
+					downvote.classList.remove('active')
+					scoretext.textContent = score + 2
+					votedirection = "1"
+				} else {
+					upvote.classList.add('active')
+					scoretext.textContent = score + 1
+					votedirection = "1"
+				}
+
+				if (upvote.classList.contains('active')) {
+					scoretext.classList.add('score-up')
+					scoretext.classList.remove('score-down')
+					scoretext.classList.remove('score')
+				} else if (downvote.classList.contains('active')) {
+					scoretext.classList.add('score-down')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score')
+				} else {
+					scoretext.classList.add('score')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score-down')
+				}
+			}
+			else {
+				if (downvote.classList.contains('active')) {
+					downvote.classList.remove('active')
+					scoretext.textContent = score + 1
+					votedirection = "0"
+				} else if (upvote.classList.contains('active')) {
+					downvote.classList.add('active')
+					upvote.classList.remove('active')
+					scoretext.textContent = score - 2
+					votedirection = "-1"
+				} else {
+					downvote.classList.add('active')
+					scoretext.textContent = score - 1
+					votedirection = "-1"
+				}
+
+				if (upvote.classList.contains('active')) {
+					scoretext.classList.add('score-up')
+					scoretext.classList.remove('score-down')
+					scoretext.classList.remove('score')
+				} else if (downvote.classList.contains('active')) {
+					scoretext.classList.add('score-down')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score')
+				} else {
+					scoretext.classList.add('score')
+					scoretext.classList.remove('score-up')
+					scoretext.classList.remove('score-down')
+				}
+			}
+
+			var xhr = new XMLHttpRequest();
+			xhr.open("POST", "/vote/" + type.replace('-mobile','') + "/" + id + "/" + votedirection, true);
+			var form = new FormData()
+			form.append("formkey", formkey());
+			xhr.withCredentials=true;
+			xhr.send(form);
+		}
+	</script>
+{% endif %}
+
 {% if request.host == 'pcmemes.net' %}
 	{% set cc='SPLASH MOUNTAIN' %}
 {% else %}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 0700ab32a..e08beacae 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -81,7 +81,7 @@
 														<input id="file-upload" type="file" name="file" {% if request.headers.get('cf-ipcountry')=="T1" %}disabled{% endif %} accept="image/*, video/*" hidden>
 													</label>
 													<small class="form-text text-muted">Optional if you have text.</small>
-													<small class="form-text text-muted">You can upload videos up to 1 minute long.</small>
+													<small class="form-text text-muted">You can upload images or videos up to 1 minute long.</small>
 												</div>
 												</div>
 
@@ -173,7 +173,7 @@
 		</div>
 		{% endblock %}
 
-		<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 		<script defer src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
 
 		<script defer src="/assets/js/submit.js?v=72"></script>