Increase cachability for twitch-embed.html by setting cache-control a…

…nd using hash instead of query string.
stefansundin · Jul 6, 2020 · 0ebaca5 · 0ebaca5
1 parent dc5ad56
commit 0ebaca5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app.rb b/app.rb
@@ -49,6 +49,7 @@
 
 get "/twitch-embed.html" do
   content_type :html
+  cache_control :public, :max_age => 31556926 # cache a long time
   SecureHeaders.use_secure_headers_override(request, :twitch_embed)
   send_file File.join(settings.views, "twitch-embed.html")
 end

diff --git a/config/initializers/05-string.rb b/config/initializers/05-string.rb
@@ -162,7 +162,7 @@ def embed_html(request=nil)
       # https://www.twitch.tv/gamesdonequick
       # https://www.twitch.tv/gamesdonequick/video/76877760 (legacy url)
       # https://www.twitch.tv/gamesdonequick/v/76877760 (legacy url)
-      url = "#{request.root_url}/twitch-embed.html?"
+      url = "#{request.root_url}/twitch-embed.html#"
       url += vod_id ? "video=#{vod_id}" : "channel=#{channel_name}"
       url += "&time=#{t}" if t
       <<~EOF

diff --git a/views/twitch-embed.html b/views/twitch-embed.html
@@ -16,7 +16,7 @@
 <noscript>Please enable JavaScript.</noscript>
 
 <script>
-let qs = window.location.search;
+let qs = window.location.hash.substr(1);
 qs += `&parent=${window.location.hostname}`;
 if (document.referrer != "") {
   const referrer = new URL(document.referrer);
@@ -29,7 +29,7 @@
 iframe.frameBorder = "0";
 iframe.scrolling = "no";
 iframe.allowFullscreen = true;
-iframe.src = `https://player.twitch.tv/${qs}`;
+iframe.src = `https://player.twitch.tv/?${qs}`;
 document.body.appendChild(iframe);
 </script>
 </body>

diff --git a/views/twitch.atom.erb b/views/twitch.atom.erb
@@ -17,7 +17,7 @@
     <author><name><%= video["user_name"].esc %></name></author>
     <content type="html">
 <%= <<~EOF.esc
-  <iframe width="620" height="378" src="#{request.root_url}/twitch-embed.html?video=#{video["id"]}" frameborder="0" scrolling="no" allowfullscreen referrerpolicy="no-referrer"></iframe>
+  <iframe width="620" height="378" src="#{request.root_url}/twitch-embed.html#video=#{video["id"]}" frameborder="0" scrolling="no" allowfullscreen referrerpolicy="no-referrer"></iframe>
 
   <p>
     <a href="https://player.twitch.tv/?parent=twitch.tv&video=#{video["id"]}" rel="noreferrer">Open embed</a> |