From a6b0e0721d9db9e026adee691915f9fc86798f13 Mon Sep 17 00:00:00 2001
From: Stefan Sundin <git@stefansundin.com>
Date: Tue, 10 Oct 2017 22:36:11 -0700
Subject: [PATCH] Use fragment for width/height since adding any querystring
 gives you 404.

---
 config/initializers/05-string.rb | 3 ++-
 views/twitter_feed.erb           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/initializers/05-string.rb b/config/initializers/05-string.rb
index f144170..823dedc 100644
--- a/config/initializers/05-string.rb
+++ b/config/initializers/05-string.rb
@@ -257,7 +257,8 @@ def embed_html(request=nil)
     elsif %r{^https?://video\.twimg\.com/.+/(?<width>\d+)x(?<height>\d+)/.+\.mp4}i =~ self
       "<iframe width='#{width}' height='#{height}' src='#{self}' frameborder='0' scrolling='no' allowfullscreen referrerpolicy='no-referrer'></iframe>"
     elsif %r{^https?://[a-z0-9\-._~:/?#\[\]@!$&'()*+,;=]+\.mp4}i =~ self
-      query = CGI.parse(URI.parse(self).query || "")
+      uri = URI.parse(self)
+      query = CGI.parse(uri.query || "").merge(CGI.parse(uri.fragment || "")) { |key,oldval,newval| oldval + newval }
       width = query["w"][0] || "640"
       height = query["h"][0] || "538"
       "<iframe width='#{width}' height='#{height}' src='#{self}' frameborder='0' scrolling='no' allowfullscreen referrerpolicy='no-referrer'></iframe>"
diff --git a/views/twitter_feed.erb b/views/twitter_feed.erb
index db553d2..8289976 100644
--- a/views/twitter_feed.erb
+++ b/views/twitter_feed.erb
@@ -34,7 +34,7 @@
         text += " #{video["url"]}"
       else
         # no dimension information in the URL, so add some (i.e. /tweet_video/)
-        text += " #{video["url"]}?w=#{entity["sizes"]["large"]["w"]}&h=#{entity["sizes"]["large"]["h"]}"
+        text += " #{video["url"]}#w=#{entity["sizes"]["large"]["w"]}&h=#{entity["sizes"]["large"]["h"]}"
       end
     end
   end