From ed06b4bcb1b838332f4ca3a8b7e637d2865f83d7 Mon Sep 17 00:00:00 2001
From: Bobby <bobby@fiery.me>
Date: Tue, 28 Jun 2022 11:47:28 +0700
Subject: [PATCH] feat: allow disabling redirect on js-only pages

---
 views/_partial/noscript-refresh.njk |  2 ++
 views/_partial/noscript.njk         | 12 +++++-------
 views/album.njk                     |  2 +-
 views/player.njk                    |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/views/_partial/noscript-refresh.njk b/views/_partial/noscript-refresh.njk
index c86cfae..10dd7df 100644
--- a/views/_partial/noscript-refresh.njk
+++ b/views/_partial/noscript-refresh.njk
@@ -5,6 +5,8 @@
 #}
 <noscript>
   <style>body > section:not(#noscript) { display: none !important; }</style>
+  {% if noscriptRefreshUrl !== null -%}
   <!-- Redirect after 3 seconds -->
   <meta http-equiv="refresh" content="3;url={{ noscriptRefreshUrl or 'nojs' }}">
+  {%- endif %}
 </noscript>
diff --git a/views/_partial/noscript.njk b/views/_partial/noscript.njk
index 298630d..da213b7 100644
--- a/views/_partial/noscript.njk
+++ b/views/_partial/noscript.njk
@@ -5,13 +5,11 @@
         <p>
           This page requires JavaScript to function.
         </p>
-        <p>
-          {%- if noscriptMessage -%}
-          {{ noscriptMessage | safe }}
-          {%- else -%}
-          If you are not automatically redirected to our No-JS uploader, <a href="nojs">click here</a>.
-          {%- endif -%}
-        </p>
+        {% if noscriptMessage or (noscriptMessage === null) -%}
+        {{ noscriptMessage | safe }}
+        {%- else -%}
+        <p>If you are not automatically redirected to our No-JS uploader, <a href="nojs">click here</a>.</p>
+        {%- endif %}
       </div>
     </div>
   </section>
diff --git a/views/album.njk b/views/album.njk
index c80ca54..d6a9176 100644
--- a/views/album.njk
+++ b/views/album.njk
@@ -147,7 +147,7 @@
 {% set floatingHomeHref = '..' %}
 {% include "_partial/floating-home.njk" %}
 {% if not nojs -%}
-{% set noscriptMessage = 'If you are not automatically redirected to its No-JS version, <a href="' + noJsUrl + '">click here</a>.' %}
+{% set noscriptMessage = '<p>If you are not automatically redirected to its No-JS version, <a href="' + noJsUrl + '">click here</a>.</p>' %}
 {% include "_partial/noscript.njk" %}
 {%- endif %}
 {% endblock %}
diff --git a/views/player.njk b/views/player.njk
index 19497e9..8d8b658 100644
--- a/views/player.njk
+++ b/views/player.njk
@@ -34,6 +34,7 @@
 <script src="../js/misc/utils.js{{ versions[1] }}"></script>
 {% endblock %}
 
+{% set noscriptRefreshUrl = null %}
 {% block endmeta %}
 {% include "_partial/noscript-refresh.njk" %}
 {% endblock %}
@@ -92,5 +93,6 @@
 
 {% set floatingHomeHref = '..' %}
 {% include "_partial/floating-home.njk" %}
+{% set noscriptMessage = null %}
 {% include "_partial/noscript.njk" %}
 {% endblock %}