diff --git a/files/classes/user.py b/files/classes/user.py index 7a74200f3b..852cd0ecee 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -481,7 +481,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/helpers/const.py b/files/helpers/const.py index b48ba629de..9da6e36465 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": @@ -150,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: @@ -173,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 @@ -890,4 +896,6 @@ NOTIFIED_USERS = { 'landlordmessiah': LLM_ID, ' llm ': LLM_ID, 'landlet': LLM_ID, + 'dong': DONGER_ID, + 'dong': FARTBINN_ID } 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/authforms.html b/files/templates/authforms.html index 1976410374..e14c8c3a40 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -14,11 +14,11 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} 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" %} - - {% endblock %} \ No newline at end of file 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 @@
- + {% if "gigachadlife" in request.host %} GigaChadLife {% elif 'pcm' not in request.host %} diff --git a/files/templates/log.html b/files/templates/log.html index 35d81cee6f..ab7fd2b0ef 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,11 +6,11 @@ {% block content %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %}
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index ef032638aa..ded78434a1 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -13,7 +13,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings2.html b/files/templates/settings2.html index b7c871b676..0e5c0e703a 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -12,7 +12,7 @@ - + @@ -38,10 +38,10 @@ {% if v %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 9b6c9a265b..6c4b227b05 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - +