From 9468ede4e3e6f07816bd51d73ef104c4fffee818 Mon Sep 17 00:00:00 2001
From: "byte[]" <byteslice@airmail.cc>
Date: Thu, 28 Nov 2019 19:34:22 -0500
Subject: [PATCH] always use custom user agent

---
 lib/philomena/http.ex                                       | 4 ++++
 lib/philomena/scrapers/twitter.ex                           | 3 +--
 lib/philomena_web/templates/search/reverse/index.html.slime | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/philomena/http.ex b/lib/philomena/http.ex
index 12705e89..94570e71 100644
--- a/lib/philomena/http.ex
+++ b/lib/philomena/http.ex
@@ -1,11 +1,15 @@
 defmodule Philomena.Http do
+  @user_agent ["User-Agent": "Mozilla/5.0 (X11; Philomena; Linux x86_64; rv:70.0) Gecko/20100101 Firefox/70.0"]
+
   def get!(url, headers \\ [], options \\ []) do
+    headers = Keyword.merge(@user_agent, headers)
     options = Keyword.merge(options, proxy: proxy_host())
 
     HTTPoison.get!(url, headers, options)
   end
 
   def head!(url, headers \\ [], options \\ []) do
+    headers = Keyword.merge(@user_agent, headers)
     options = Keyword.merge(options, proxy: proxy_host())
 
     HTTPoison.head!(url, headers, options)
diff --git a/lib/philomena/scrapers/twitter.ex b/lib/philomena/scrapers/twitter.ex
index f036fbc1..1fab2ba4 100644
--- a/lib/philomena/scrapers/twitter.ex
+++ b/lib/philomena/scrapers/twitter.ex
@@ -3,7 +3,6 @@ defmodule Philomena.Scrapers.Twitter do
   @url_regex ~r|\Ahttps?://(?:mobile\.)?twitter.com/([A-Za-z\d_]+)/status/([\d]+)/?|
   @script_regex ~r|<script type="text/javascript" .*? src="(https://abs.twimg.com/responsive-web/web/main\.[\da-z]+\.js)">|
   @bearer_regex ~r|"(AAAAAAAAAAAAA[^"]*)"|
-  @user_agent ["User-Agent": "Mozilla/5.0 (X11; Philomena; Linux x86_64; rv:70.0) Gecko/20100101 Firefox/70.0"]
 
   @spec can_handle?(URI.t(), String.t()) :: true | false
   def can_handle?(_uri, url) do
@@ -39,7 +38,7 @@ defmodule Philomena.Scrapers.Twitter do
     url = "https://twitter.com/#{user}/status/#{status_id}"
 
     {gt, bearer} =
-      Philomena.Http.get!(mobile_url, @user_agent)
+      Philomena.Http.get!(mobile_url)
       |> Map.get(:body)
       |> extract_guest_token_and_bearer()
 
diff --git a/lib/philomena_web/templates/search/reverse/index.html.slime b/lib/philomena_web/templates/search/reverse/index.html.slime
index 0d485b84..343d1b75 100644
--- a/lib/philomena_web/templates/search/reverse/index.html.slime
+++ b/lib/philomena_web/templates/search/reverse/index.html.slime
@@ -45,7 +45,7 @@ h1 Reverse Search
       
       = for match <- @images do
         tr
-          td
+          th
             h3 = link "##{match.id}", to: Routes.image_path(@conn, :show, match)
             p
               = if match.source_url not in [nil, ""] do
@@ -54,10 +54,10 @@ h1 Reverse Search
               - else
                 ' Unknown source
 
-          td
+          th
             = render PhilomenaWeb.ImageView, "_image_container.html", image: match, size: :thumb, conn: @conn
 
-          td
+          th
             h3
               = match.image_width
               | x