From d1b9769d8941e4ce7d95bc2f3a574586da47b3c9 Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Thu, 7 Nov 2024 20:28:26 -0800
Subject: [PATCH] Add footer buffer only in necessary templates

---
 src/invidious/helpers/macros.cr          | 3 +--
 src/invidious/routes/channels.cr         | 3 ++-
 src/invidious/routes/preferences.cr      | 2 +-
 src/invidious/views/channel.ecr          | 4 ++++
 src/invidious/views/template.ecr         | 5 -----
 src/invidious/views/user/preferences.ecr | 2 ++
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/invidious/helpers/macros.cr b/src/invidious/helpers/macros.cr
index d55fa6fc..43e7171b 100644
--- a/src/invidious/helpers/macros.cr
+++ b/src/invidious/helpers/macros.cr
@@ -48,9 +48,8 @@ module JSON::Serializable
   end
 end
 
-macro templated(_filename, template = "template", navbar_search = true, buffer_footer = false)
+macro templated(_filename, template = "template", navbar_search = true)
   navbar_search = {{navbar_search}}
-  buffer_footer = {{buffer_footer}}
 
   {{ filename = "src/invidious/views/" + _filename + ".ecr" }}
   {{ layout = "src/invidious/views/" + template + ".ecr" }}
diff --git a/src/invidious/routes/channels.cr b/src/invidious/routes/channels.cr
index ce158c33..593b5bcb 100644
--- a/src/invidious/routes/channels.cr
+++ b/src/invidious/routes/channels.cr
@@ -152,7 +152,8 @@ module Invidious::Routes::Channels
     items.each(&.author = "")
 
     selected_tab = Frontend::ChannelPage::TabsAvailable::Playlists
-    templated "channel", buffer_footer: true
+
+    templated "channel"
   end
 
   def self.podcasts(env)
diff --git a/src/invidious/routes/preferences.cr b/src/invidious/routes/preferences.cr
index 729d6183..39ca77c0 100644
--- a/src/invidious/routes/preferences.cr
+++ b/src/invidious/routes/preferences.cr
@@ -8,7 +8,7 @@ module Invidious::Routes::PreferencesRoute
 
     preferences = env.get("preferences").as(Preferences)
 
-    templated "user/preferences", buffer_footer: true
+    templated "user/preferences"
   end
 
   def self.update(env)
diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr
index a84e44bc..daba19ca 100644
--- a/src/invidious/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
@@ -52,3 +52,7 @@
 
 
 <%= rendered "components/items_paginated" %>
+
+<% if selected_tab == Frontend::ChannelPage::TabsAvailable::Playlists %>
+<div id="footer_buffer"></div>  
+<% end %>
\ No newline at end of file
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index 1c33ec84..d52fd20f 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -111,11 +111,6 @@
             <% end %>
 
             <%= content %>
-
-            <% if buffer_footer %>
-                <div id="footer_buffer"></div>
-            <% end %>
-
         </div>
     </div>
     <script src="/js/handlers.js?v=<%= ASSET_COMMIT %>"></script>
diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecr
index cf8b5593..9fcbe74d 100644
--- a/src/invidious/views/user/preferences.ecr
+++ b/src/invidious/views/user/preferences.ecr
@@ -361,3 +361,5 @@
         </fieldset>
     </form>
 </div>
+
+<div id="footer_buffer"></div>