From dfd8e299cd64535fd80102f1407215ed51f4fa92 Mon Sep 17 00:00:00 2001
From: David Bailey <davidbailey.2889@gmail.com>
Date: Mon, 22 Jan 2024 16:48:52 +0100
Subject: [PATCH] feat: small tweaks

---
 www/.htaccess        | 6 +++++-
 www/static/banner.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/.htaccess b/www/.htaccess
index 20c4100..eb86f63 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -9,11 +9,15 @@ AddType text/plain .rss
 RewriteEngine On
 RewriteBase /
 
-RewriteCond %{REQUEST_URI} !^/raw/
+RewriteCond %{REQUEST_URI} !^/(raw|static)/
 RewriteRule ^.*\.(flv|gif|ico|jpg|jpeg|mp4|mpeg|png|svg|swf|webp)$ raw/%{HTTP_HOST}%{REQUEST_URI} [L,END]
 
 RewriteRule ^/?raw/(.*)$ raw/%{HTTP_HOST}/$1 [L,END]
 
+RewriteEngine On
+RewriteCond %{HTTPS} !on
+RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L,END]
+
 RewriteCond %{REQUEST_URI} !^/?(static|raw|robots\.txt).*
 RewriteRule (.*) router.php
 
diff --git a/www/static/banner.js b/www/static/banner.js
index 7af1dc4..1dc78c1 100644
--- a/www/static/banner.js
+++ b/www/static/banner.js
@@ -76,7 +76,7 @@ class BannerHandler {
         this.bannerDOM.style.opacity = 0;
     }
     fadeIn() {
-        this.bannerDOM.style.opacity = 0.3;
+        this.bannerDOM.style.opacity = this.currentBannerData.opacity || 0.3;
     }
 
     loadNextBanner() {