zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

temp disable archive button, cleanups for new gems

Browse source
This commit is contained in:
Kyle Drake 2018-12-10 07:36:22 +00:00
parent 81d8c09c18
commit 9399bebee7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/index.rb
View file

@ -64,7 +64,7 @@ get '/?' do
@blog_feed_html = '' @blog_feed_html = ''
begin 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 = Feedjira::Feed.parse xml
feed.entries[0..2].each do |entry| 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>} @blog_feed_html += %{<a href="#{entry.url}">#{entry.title.split('.').first}</a> <span style="float: right">#{entry.published.strftime('%b %-d, %Y')}</span><br>}

4
views/site.erb
View file

@ -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> <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> <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> <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 %> <% end %>
--> -->
@ -37,7 +37,7 @@
<a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i> Edit Site</a> <a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i> Edit Site</a>
<% end %> <% 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> <a href="/site/<%= site.username %>/archives" class="btn-Action edit"><i class="fa fa-history" title="Archives"></i> Archives</a>
<% end %> <% end %>

2
workers/lets_encrypt_worker.rb
View file

@ -62,7 +62,7 @@ class LetsEncryptWorker
puts "testing #{challenge_url}" puts "testing #{challenge_url}"
begin 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 rescue => e
puts e.inspect puts e.inspect
puts "error with #{challenge_url}" puts "error with #{challenge_url}"