From 80d04b6d9d3b404d28c877c40d2e705fdd0c9b75 Mon Sep 17 00:00:00 2001
From: TLSM <duolsm@outlook.com>
Date: Mon, 30 May 2022 01:50:52 -0400
Subject: [PATCH] assetcache: Add theme CSS support; bust recent.

---
 files/templates/authforms.html       |  2 +-
 files/templates/chat.html            |  2 +-
 files/templates/default.html         |  2 +-
 files/templates/log.html             |  2 +-
 files/templates/settings.html        |  2 +-
 files/templates/settings2.html       |  2 +-
 files/templates/submit.html          |  2 +-
 files/templates/util/assetcache.html | 23 +++++++++++++++++++----
 8 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 052fc4563a..dc31e87455 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -19,7 +19,7 @@
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
 			<link rel="stylesheet" href="{{asset('css/main.css')}}">
-			<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=57">
+			<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 			{% if v.agendaposter %}
 				<style>
 					html {
diff --git a/files/templates/chat.html b/files/templates/chat.html
index a5ec6d6e2d..04c53b193a 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -16,7 +16,7 @@
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
 	<link rel="stylesheet" href="{{asset('css/main.css')}}">
-	<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=57">
+	<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 	{% if v.css %}
 		<link rel="stylesheet" href="/@{{v.username}}/css">
 	{% endif %}
diff --git a/files/templates/default.html b/files/templates/default.html
index 78d6bd52de..6b2da98588 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -14,7 +14,7 @@
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
 		<link rel="stylesheet" href="{{asset('css/main.css')}}">
-		<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=58">
+		<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 		<link rel="stylesheet" href="/assets/css/awards.css?v=7">
 		{% if v.agendaposter %}
 			<style>
diff --git a/files/templates/log.html b/files/templates/log.html
index 9aa7332c25..3bf154c990 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -7,7 +7,7 @@
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
 	<link rel="stylesheet" href="{{asset('css/main.css')}}">
-	<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=57">
+	<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 	{% if v.agendaposter %}
 		<style>
 			html {
diff --git a/files/templates/settings.html b/files/templates/settings.html
index c94fffd629..802b7cba03 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -35,7 +35,7 @@
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
 	<link rel="stylesheet" href="{{asset('css/main.css')}}">
-	<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=57">
+	<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 	{% if v.agendaposter %}
 		<style>
 			html {
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 6e896472eb..a3c2367464 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -40,7 +40,7 @@
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
 		<link rel="stylesheet" href="{{asset('css/main.css')}}">
-		<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=57">
+		<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 	{% else %}
 		<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
 		<link rel="stylesheet" href="{{asset('css/main.css')}}">
diff --git a/files/templates/submit.html b/files/templates/submit.html
index f5a6aa6883..f3d80cdec4 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -28,7 +28,7 @@
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
 			<link rel="stylesheet" href="{{asset('css/main.css')}}">
-			<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=49">
+			<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 			{% if v.agendaposter %}
 				<style>
 					html {
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index 082e8d95e2..e4bd2a80ec 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -1,9 +1,24 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 283,
-	'js/award_modal.js': 251,
-	'js/bootstrap.js': 257,
-	'js/header.js': 268,
+	'css/main.css': 284,
+
+	'css/4chan.css': 59,
+	'css/classic.css': 59,
+	'css/classic_dark.css': 59,
+	'css/coffee.css': 59,
+	'css/dark.css': 59,
+	'css/dramblr.css': 59,
+	'css/light.css': 59,
+	'css/midnight.css': 59,
+	'css/reddit.css': 59,
+	'css/transparent.css': 59,
+	'css/tron.css': 59,
+	'css/win98.css': 59,
+
+	'js/award_modal.js': 252,
+	'js/bootstrap.js': 258,
+	'js/header.js': 269,
+	
 	'images/badges/': 1017,
 }
 -%}