From 87098ff954bdf0cd05479fd15f10c3fea63b782a Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 12 Dec 2021 21:20:57 +0200
Subject: [PATCH 1/6] n word

---
 files/classes/user.py                   | 2 +-
 files/templates/authforms.html          | 4 ++--
 files/templates/default.html            | 4 ++--
 files/templates/emoji_modal.html        | 4 ++--
 files/templates/log.html                | 4 ++--
 files/templates/login.html              | 2 +-
 files/templates/login_2fa.html          | 2 +-
 files/templates/settings.html           | 2 +-
 files/templates/settings2.html          | 4 ++--
 files/templates/sign_up.html            | 2 +-
 files/templates/sign_up_failed_ref.html | 2 +-
 files/templates/submit.html             | 4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/files/classes/user.py b/files/classes/user.py
index 645dbce378..1a9075c0de 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -477,7 +477,7 @@ class User(Base):
 	def json(self):
 		data = self.json_core
 
-		data["badges"] = [x.json_core for x in self.badges]
+		data["badges"] = [x.json for x in self.badges]
 		data['coins'] = self.coins
 		data['post_count'] = self.post_count
 		data['comment_count'] = self.comment_count
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 1976410374..b2f253f9c2 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -14,11 +14,11 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+			<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+			<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 		{% endif %}
 
 </head>
diff --git a/files/templates/default.html b/files/templates/default.html
index 5ecb1cc323..b958018bf6 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -6,12 +6,12 @@
 	<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=152">
+		<link rel="stylesheet" href="/assets/css/main.css?v=153">
 		<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 		{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 	{% endif %}
 
 	<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 50b0fa2741..232ac9e0cd 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -1,6 +1,6 @@
 <div id="form" class="d-none"></div>
 <div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
-	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-2 py-5" role="document">
+	<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-2 py-5 emoji-modal" role="document">
 		<div class="modal-content" id="emojiTabs">
 			<div class="modal-header">
 				<div>
@@ -81,7 +81,7 @@
 	</div>
 </div>
 
-<script src="/assets/js/emoji_modal.js?v=147"></script>
+<script src="/assets/js/emoji_modal.js?v=154"></script>
 
 <style>
 	a.emojitab {
diff --git a/files/templates/log.html b/files/templates/log.html
index 35d81cee6f..44da752f15 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=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+	<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+	<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 {% endif %}
 
 <div class="row justify-content-around">
diff --git a/files/templates/login.html b/files/templates/login.html
index 61921fbabb..c2952d1971 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -17,7 +17,7 @@
 	{% endblock %}
 	
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=152><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=70">
+	<link rel="stylesheet" href="/assets/css/main.css?v=153><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=70">
 	<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
 
 </head>
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index ef032638aa..efbb306c26 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -13,7 +13,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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 
 </head>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 652b513cb1..06c7da0576 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -33,7 +33,7 @@
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+	<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 
 		<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index e96b837cc8..d5eccd4515 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -38,10 +38,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 	{% endif %}
 
 		<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 149eadd809..ee2a2b5797 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -30,7 +30,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 
 </head>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 9b6c9a265b..92e5c84355 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 
 </head>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 63f034a5f4..1e3c277be7 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -25,11 +25,11 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+			<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=152">
+			<link rel="stylesheet" href="/assets/css/main.css?v=153">
 			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 		{% endif %}
 		{% endblock %}

From bebf5b57bbce26a77ed038bcea409a53cbd49581 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 12 Dec 2021 21:22:35 +0200
Subject: [PATCH 2/6] fsdsfd

---
 files/templates/authforms.html          |  4 ++--
 files/templates/default.html            |  4 ++--
 files/templates/formatting.html         | 12 ------------
 files/templates/log.html                |  4 ++--
 files/templates/login.html              |  2 +-
 files/templates/login_2fa.html          |  2 +-
 files/templates/settings.html           |  2 +-
 files/templates/settings2.html          |  4 ++--
 files/templates/sign_up.html            |  2 +-
 files/templates/sign_up_failed_ref.html |  2 +-
 files/templates/submit.html             |  4 ++--
 11 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index b2f253f9c2..e14c8c3a40 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -14,11 +14,11 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+			<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+			<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 		{% endif %}
 
 </head>
diff --git a/files/templates/default.html b/files/templates/default.html
index b958018bf6..0a076d429f 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -6,12 +6,12 @@
 	<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=153">
+		<link rel="stylesheet" href="/assets/css/main.css?v=154">
 		<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 		{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 	{% endif %}
 
 	<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 47f221aa21..cbd88374aa 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -521,16 +521,4 @@ line breaks
 
 {% include "expanded_image_modal.html" %}
 
-<style>
-	@media (max-width: 767.98px) {
-		table {
-			display: inline-block;
-			overflow: auto;
-		}
-	}
-	pre {
-		color: var(--white) !important;
-	}
-</style>
-
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/log.html b/files/templates/log.html
index 44da752f15..ab7fd2b0ef 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=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+	<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+	<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 {% endif %}
 
 <div class="row justify-content-around">
diff --git a/files/templates/login.html b/files/templates/login.html
index c2952d1971..95eabe3520 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -17,7 +17,7 @@
 	{% endblock %}
 	
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=153><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=70">
+	<link rel="stylesheet" href="/assets/css/main.css?v=154><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=70">
 	<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
 
 </head>
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index efbb306c26..ded78434a1 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -13,7 +13,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=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 
 </head>
 
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 06c7da0576..2d7e8809fc 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -33,7 +33,7 @@
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+	<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 
 		<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index d5eccd4515..5070bd2fbb 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -38,10 +38,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 	{% endif %}
 
 		<link href="/assets/css/fa.css?v=55" rel="stylesheet"> 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index ee2a2b5797..d304da4a9c 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -30,7 +30,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 
 </head>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 92e5c84355..6c4b227b05 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
+		<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 
 </head>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 1e3c277be7..6f2920e98a 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -25,11 +25,11 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
+			<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=153">
+			<link rel="stylesheet" href="/assets/css/main.css?v=154">
 			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
 		{% endif %}
 		{% endblock %}

From 10186dbbc794dd2c6d9ca48bcdb0ec753672ac7d Mon Sep 17 00:00:00 2001
From: Captain <Captain@Notebook>
Date: Sun, 12 Dec 2021 20:25:55 +0100
Subject: [PATCH 3/6] Added Donger and Fartbinn to the dong notification

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

diff --git a/files/helpers/const.py b/files/helpers/const.py
index 387ab44bde..dacff629f9 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -127,6 +127,8 @@ if SITE == 'rdrama.net':
 	LLM_ID = 253
 	DAD_ID = 2513
 	MOM_ID = 4588
+	DONGER_ID = 541
+	FARTBINN_ID = 2256 
 	BUG_THREAD = 18459
 	EMOJI_THREAD = 22479
 elif SITE == "pcmemes.net":
@@ -826,4 +828,6 @@ NOTIFIED_USERS = {
 	'landlordmessiah': LLM_ID,
 	' llm ': LLM_ID,
 	'landlet': LLM_ID,
+	'donger': DONGER_ID,
+	'donger': FARTBINN_ID
 }

From d4c9d04269a38ad81941f58b33f8af6861787836 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 12 Dec 2021 21:26:09 +0200
Subject: [PATCH 4/6] fsdfds

---
 files/routes/static.py         |  2 +-
 files/templates/default.html   | 58 +++++++++++++++++-----------------
 files/templates/header.html    |  2 +-
 files/templates/settings.html  |  2 +-
 files/templates/settings2.html |  2 +-
 files/templates/submit.html    |  2 +-
 6 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/files/routes/static.py b/files/routes/static.py
index fd35707b4d..493899585c 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -212,7 +212,7 @@ def log_item(id, v):
 
 @app.get("/assets/favicon.ico")
 def favicon():
-	return send_file(f"./assets/images/{site_name}/icon.webp")
+	return send_file(f"./assets/images/{site_name}/icon.webp?v=5")
 
 @app.get("/api")
 @auth_desired
diff --git a/files/templates/default.html b/files/templates/default.html
index 0a076d429f..cfc8774378 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -21,7 +21,7 @@
 
 	<meta name="thumbnail" content="/assets/images/{{'SITE_NAME' | app_config}}/preview.webp?v=3">
 
-	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4">
+	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5">
 	{% block title %}
 	<title>{{'SITE_NAME' | app_config}}</title>
 
@@ -48,10 +48,10 @@
 	<meta name="format-detection" content="telephone=no">
 	<meta name="viewport" content="width=device-width,initial-scale=1">
 
-	<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4">
+	<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5">
 		<link rel="manifest" href="/assets/manifest.json">
-		<link rel="mask-icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4" color="#{{'DEFAULT_COLOR' | app_config}}">
-		<link rel="shortcut icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4">
+		<link rel="mask-icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5" color="#{{'DEFAULT_COLOR' | app_config}}">
+		<link rel="shortcut icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5">
 		<meta name="apple-mobile-web-app-title" content="{{'SITE_NAME' | app_config}}">
 		<meta name="application-name" content="{{'SITE_NAME' | app_config}}">
 		<meta name="msapplication-TileColor" content="#{{'DEFAULT_COLOR' | app_config}}">
@@ -63,127 +63,127 @@
 		<link
 		rel="apple-touch-startup-image"
 		sizes="320x480"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="640x960"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-icon"
 		sizes="640x1136"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-icon"
 		sizes="750x1334"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="768x1004"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="768x1024"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="828x1792"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1024x748"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1024x768"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1125x2436"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1242x2208"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1242x2688"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1334x750"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1536x2008"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1536x2048"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1668x2224"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1792x828"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2048x1496"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2048x1536"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2048x2732"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2208x1242"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2224x1668"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2436x1125"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2668x1242"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2737x2048"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5"
 		>
 
 		{% block fixedMobileBarJS %}
diff --git a/files/templates/header.html b/files/templates/header.html
index 4ffc098d6d..16a524472c 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -8,7 +8,7 @@
 		<div class="container-fluid" style="padding:0;">
 			<div class="flex-grow-1">
 				<a href="/" class="navbar-brand mr-auto">
-					<img loading="lazy" height="30" src="/assets/images/{{'SITE_NAME' | app_config}}/headericon.webp?v=4">
+					<img loading="lazy" height="30" src="/assets/images/{{'SITE_NAME' | app_config}}/headericon.webp?v=5">
 					{% if "gigachadlife" in request.host %}
 						<span style="font-weight: bold; font-size: 1.2rem;">GigaChadLife</span>
 					{% elif 'pcm' not in request.host %}
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 2d7e8809fc..70a4cc37c3 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -11,7 +11,7 @@
 	<meta name="description" content="">
 	<meta name="author" content="">
 
-	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4">
+	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5">
 
 	<title>{% block pagetitle %}Settings - {{'SITE_NAME' | app_config}}{% endblock %}</title>
 		<meta property="og:type" content="article" >
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 5070bd2fbb..28d063068b 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -12,7 +12,7 @@
 	<meta name="description" content="">
 	<meta name="author" content="">
 	<meta name="thumbnail" content="/assets/images/{{'SITE_NAME' | app_config}}/preview.webp?v=3">
-	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4">
+	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5">
 
 	<meta property="og:type" content="article" >
 	<meta property="og:title" content="{{'SITE_NAME' | app_config}}" >
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 6f2920e98a..f72657d8ad 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -9,7 +9,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 		<meta name="description" content="">
 		<meta name="author" content="">
-		<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4">
+		<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5">
 
 		{% if request.host == 'pcmemes.net' %}
 			{% set cc='Splash Mountain' %}

From 0c0b8381fdebe9cbe3b128cee2beca0daf18f4dc Mon Sep 17 00:00:00 2001
From: Captain <Captain@Notebook>
Date: Sun, 12 Dec 2021 20:27:21 +0100
Subject: [PATCH 5/6] asd

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

diff --git a/files/helpers/const.py b/files/helpers/const.py
index dacff629f9..8bd9473d68 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -828,6 +828,6 @@ NOTIFIED_USERS = {
 	'landlordmessiah': LLM_ID,
 	' llm ': LLM_ID,
 	'landlet': LLM_ID,
-	'donger': DONGER_ID,
-	'donger': FARTBINN_ID
+	'dong': DONGER_ID,
+	'dong': FARTBINN_ID
 }

From 50321b5d8c9f566ccd74d5d3d19762ea6ba631f9 Mon Sep 17 00:00:00 2001
From: Aevann1 <59999695+Aevann1@users.noreply.github.com>
Date: Sun, 12 Dec 2021 11:36:49 -0800
Subject: [PATCH 6/6] Update const.py

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

diff --git a/files/helpers/const.py b/files/helpers/const.py
index 8bd9473d68..066b8ac1a4 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -152,6 +152,8 @@ elif SITE == "pcmemes.net":
 	LLM_ID = 0
 	DAD_ID = 0
 	MOM_ID = 0
+	DONGER_ID = 0
+	FARTBINN_ID = 0
 	BUG_THREAD = 4103
 	EMOJI_THREAD = 0
 else:
@@ -175,6 +177,8 @@ else:
 	LLM_ID = 0
 	DAD_ID = 0
 	MOM_ID = 0
+	DONGER_ID = 0
+	FARTBINN_ID = 0
 	BUG_THREAD = 0
 	EMOJI_THREAD = 0