From 9399bebee7b43a1b68910772e7d233aff26ca685 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Mon, 10 Dec 2018 07:36:22 +0000
Subject: [PATCH] temp disable archive button, cleanups for new gems

---
 app/index.rb                   | 2 +-
 views/site.erb                 | 4 ++--
 workers/lets_encrypt_worker.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/index.rb b/app/index.rb
index d5483bae..e93d8357 100644
--- a/app/index.rb
+++ b/app/index.rb
@@ -64,7 +64,7 @@ get '/?' do
     @blog_feed_html = ''
 
     begin
-      xml = HTTP.timeout(read: 2, write: 2, connect: 2).get('https://blog.neocities.org/feed.xml').to_s
+      xml = HTTP.timeout(global: 2).get('https://blog.neocities.org/feed.xml').to_s
       feed = Feedjira::Feed.parse xml
       feed.entries[0..2].each do |entry|
         @blog_feed_html += %{<a href="#{entry.url}">#{entry.title.split('.').first}</a> <span style="float: right">#{entry.published.strftime('%b %-d, %Y')}</span><br>}
diff --git a/views/site.erb b/views/site.erb
index 42ddb111..b62d4d5f 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -22,7 +22,7 @@
       <h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? %><a href="/supporter" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
       <p class="site-url"><a href="<%= site.uri %>"><%= site.host %></a></p>
       <!--
-      <% if site.latest_archive %>
+      <% if false #site.latest_archive %>
         <p><a href="<%= site.latest_archive.url %>" style="margin-right: 5px"><%= site.latest_archive.ipfs_hash %></a><small style="font-size: 7pt"><a href="/permanent-web">(what is this?)</a></small></p>
       <% end %>
       -->
@@ -37,7 +37,7 @@
           <a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i> Edit Site</a>
         <% end %>
 
-        <% if site.latest_archive && !site.archiving_disabled %>
+        <% if site.latest_archive && !site.archiving_disabled && false %>
           <a href="/site/<%= site.username %>/archives" class="btn-Action edit"><i class="fa fa-history" title="Archives"></i> Archives</a>
         <% end %>
 
diff --git a/workers/lets_encrypt_worker.rb b/workers/lets_encrypt_worker.rb
index a72ff20b..867e85a0 100644
--- a/workers/lets_encrypt_worker.rb
+++ b/workers/lets_encrypt_worker.rb
@@ -62,7 +62,7 @@ class LetsEncryptWorker
       puts "testing #{challenge_url}"
 
       begin
-        res = HTTP.timeout(:global, write: 5, connect: 10, read: 10).follow.get(challenge_url)
+        res = HTTP.timeout(connect: 10, write: 10, read: 10).follow.get(challenge_url)
       rescue => e
         puts e.inspect
         puts "error with #{challenge_url}"