From ee375906138fae12ec5322927503281dfbf2ba40 Mon Sep 17 00:00:00 2001
From: MinetaS <skdty87@gmail.com>
Date: Tue, 4 Feb 2025 06:14:27 +0900
Subject: [PATCH] Refresh theme cookie expiration date

---
 server/fishtest/static/js/application.js | 4 +---
 server/fishtest/templates/base.mak       | 9 ---------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/server/fishtest/static/js/application.js b/server/fishtest/static/js/application.js
index d1fa8e0f3..08df13c38 100644
--- a/server/fishtest/static/js/application.js
+++ b/server/fishtest/static/js/application.js
@@ -77,9 +77,7 @@ function formatBytes(bytes) {
 }
 
 function handleApplicationThemes() {
-  if (!getCookie("theme")) {
-    setTheme(mediaTheme());
-  }
+  setTheme(getCookie("theme") ?? mediaTheme());
 
   try {
     window
diff --git a/server/fishtest/templates/base.mak b/server/fishtest/templates/base.mak
index 1428225b9..8285bdf92 100644
--- a/server/fishtest/templates/base.mak
+++ b/server/fishtest/templates/base.mak
@@ -40,15 +40,6 @@
       crossorigin="anonymous"
     >
 
-    % if request.cookies.get('theme') == 'dark':
-    <link
-      rel="stylesheet"
-      href="/css/theme.dark.css?v=${cache_busters['css/theme.dark.css']}"
-      integrity="sha384-${cache_busters['css/theme.dark.css']}"
-      crossorigin="anonymous"
-    >
-    % endif
-
     <script
       src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js"
       integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg=="