From ce85caf7817ef0e07cd4f46e39a769aee07cbda4 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 15 Jul 2013 00:45:06 -0400 Subject: [PATCH 1/4] changed counter --- app.rb | 4 ++-- migrations/016_site_updated_count.rb | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 migrations/016_site_updated_count.rb diff --git a/app.rb b/app.rb index 21dc6590..6175a3f6 100644 --- a/app.rb +++ b/app.rb @@ -279,7 +279,7 @@ post '/site_files/upload' do current_site.update site_changed: true end - current_site.update updated_at: Time.now + current_site.update changed_count: 1+current_site.changed_count, updated_at: Time.now flash[:success] = "Successfully uploaded file #{sanitized_filename}." redirect '/dashboard' @@ -349,7 +349,7 @@ post '/site_files/save/:filename' do |filename| current_site.update site_changed: true end - current_site.update updated_at: Time.now + current_site.update changed_count: 1+current_site.changed_count, updated_at: Time.now 'ok' end diff --git a/migrations/016_site_updated_count.rb b/migrations/016_site_updated_count.rb new file mode 100644 index 00000000..4ba7c0bb --- /dev/null +++ b/migrations/016_site_updated_count.rb @@ -0,0 +1,11 @@ +Sequel.migration do + up { + DB.add_column :sites, :changed_count, :integer, default: 0 + DB.add_index :sites, :changed_count + } + + down { + DB.drop_column :sites, :changed_count + DB.drop_index :sites, :changed_count + } +end \ No newline at end of file From 4fa83fd0dae3cb311a25bbb858fb6ec9fb2465d7 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 15 Jul 2013 06:45:30 +0200 Subject: [PATCH 2/4] fix nsfw, more retries --- app.rb | 2 +- workers/screenshot_worker.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app.rb b/app.rb index 21dc6590..ef5f9d78 100644 --- a/app.rb +++ b/app.rb @@ -53,7 +53,7 @@ get '/browse' do site_dataset.order!(:updated_at.desc, :hits.desc) end - site_dataset.filter!(is_nsfw: true) if params[:is_nsfw] == 'true' + site_dataset.filter! is_nsfw: (params[:is_nsfw] == 'true' ? true : false) @page_count = site_dataset.page_count || 1 @sites = site_dataset.all diff --git a/workers/screenshot_worker.rb b/workers/screenshot_worker.rb index a4230708..788d8c11 100644 --- a/workers/screenshot_worker.rb +++ b/workers/screenshot_worker.rb @@ -3,7 +3,7 @@ require 'RMagick' class ScreenshotWorker include Sidekiq::Worker - sidekiq_options queue: :screenshots, retry: 1, backtrace: true + sidekiq_options queue: :screenshots, retry: 3, backtrace: true def perform(username) screenshot = Tempfile.new 'neocities_screenshot' From e19f137a299b7f6b41c19a9ce0958e098dd3b4e8 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 15 Jul 2013 18:59:53 +0200 Subject: [PATCH 3/4] large browse button --- views/index.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/views/index.erb b/views/index.erb index 1752f0ed..d7161cfd 100644 --- a/views/index.erb +++ b/views/index.erb @@ -199,8 +199,10 @@ - - Browse all Websites + + @@ -327,4 +329,4 @@ --> - \ No newline at end of file + From b4a2d58d5a379aed80e86e02ec80e1a4a1f0bd36 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 15 Jul 2013 19:05:59 +0200 Subject: [PATCH 4/4] more visible websites link --- views/_header.erb | 4 ++-- views/index.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/_header.erb b/views/_header.erb index 8712f79d..c04d70d6 100644 --- a/views/_header.erb +++ b/views/_header.erb @@ -8,7 +8,7 @@ NeoCities
  • - Browse + Websites
  • Tutorials @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/views/index.erb b/views/index.erb index d7161cfd..892d397f 100644 --- a/views/index.erb +++ b/views/index.erb @@ -62,7 +62,7 @@ NeoCities
  • - Browse + Websites
  • Tutorials