diff --git a/app.rb b/app.rb
index b7112336..68f53efe 100644
--- a/app.rb
+++ b/app.rb
@@ -119,7 +119,7 @@ post '/site_files/upload' do
mime_type = Magic.guess_file_mime_type params[:newfile][:tempfile].path
- unless Site::VALID_MIME_TYPES.include?(mime_type) && Site::VALID_EXTENSIONS.include?(File.extname(params[:newfile][:filename]).sub(/^./, ''))
+ unless (Site::VALID_MIME_TYPES.include?(mime_type) || mime_type =~ /text/) && Site::VALID_EXTENSIONS.include?(File.extname(params[:newfile][:filename]).sub(/^./, ''))
@errors << 'File must me one of the following: HTML, Text, Image (JPG PNG GIF JPEG SVG), JS, CSS, Markdown.'
halt slim(:'site_files/new')
end
diff --git a/environment.rb b/environment.rb
index e9069cde..763c7d6f 100644
--- a/environment.rb
+++ b/environment.rb
@@ -45,3 +45,9 @@ DB.loggers << Logger.new(STDOUT) if ENV['RACK_ENV'] == 'development'
if ENV['RACK_ENV'] == 'development' && Server.count == 0
Server.create ip: '127.0.0.1', slots_available: 999999
end
+
+Backburner.configure do |config|
+ config.max_job_retries = 3
+ config.retry_delay = 200
+ config.respond_timeout = 20
+end
diff --git a/jobs/screenshot_job.rb b/jobs/screenshot_job.rb
index fac1b216..e59daf64 100644
--- a/jobs/screenshot_job.rb
+++ b/jobs/screenshot_job.rb
@@ -10,9 +10,9 @@ class ScreenshotJob
screenshot = Tempfile.new 'neocities_screenshot'
screenshot.close
- caps = Selenium::WebDriver::Remote::Capabilities.htmlunit javascript_enabled: false, takesScreenshot: true
+ caps = Selenium::WebDriver::Remote::Capabilities.htmlunit javascript_enabled: true, takesScreenshot: true
- driver = Selenium::WebDriver.for :remote, url: $config['phantomjs_url'], desired_capabilities: caps
+ driver = Selenium::WebDriver.for :remote, url: $config['phantomjs_url'][rand($config['phantomjs_url'].length)], desired_capabilities: caps
driver.manage.window.resize_to 1280, 720
wait = Selenium::WebDriver::Wait.new(:timeout => 5) # seconds
diff --git a/views/browse.slim b/views/browse.slim
index 756ae66e..e26ce514 100644
--- a/views/browse.slim
+++ b/views/browse.slim
@@ -3,7 +3,7 @@
div
h1 Web Sites on NeoCities
p If you like a site, don't forget to bookmark it!
Visitor counts are updated hourly.
- div style="margin-bottom: 40px": .btn.btn-success Create your NeoCities site now
+ div style="margin-bottom: 40px": a.btn.btn-success href="/new" Create your NeoCities site now
- count = 0
- @sites.each_with_index do |site,i|
- if count == 0
@@ -16,7 +16,7 @@
.span1
h5: b style="margin-left: 20px": a href="http://#{site.username}.neocities.org" target="_blank" #{site.username}
.span3.text-right
- p style="margin-right: 20px; margin-top: 10px; font-size: 10pt" #{site.hits} visits, updated #{site.updated_at.ago}
+ p style="margin-right: 20px; margin-top: 10px; font-size: 10pt" #{site.hits} visits, updated #{site.updated_at.ago}
a href="http://#{site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{ENV['RACK_ENV'] == 'development' ? 'victoria' : site.username}.jpg"
- if @page_count > 1