From ec8c427ef35ae2b0f07c024ea1fbf1e8ff3dc0b5 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 13 Jan 2020 12:58:20 -0600 Subject: [PATCH] reports/uploads: remove upload report page. --- app/controllers/reports_controller.rb | 7 +---- app/logical/reports/uploads.rb | 26 ----------------- app/views/reports/uploads.html.erb | 33 ---------------------- app/views/static/site_map.html.erb | 1 - script/mock_services/reportbooru.rb | 4 --- test/functional/reports_controller_test.rb | 7 ----- 6 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 app/logical/reports/uploads.rb delete mode 100644 app/views/reports/uploads.html.erb diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 2ed38b9bf..cf8b4f65c 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -1,10 +1,5 @@ class ReportsController < ApplicationController - before_action :member_only, :except => [:upload_tags] - respond_to :html, :xml, :json, only: [:upload_tags] - - def uploads - @report = Reports::Uploads.new(params[:min_date], params[:max_date], params[:queries]) - end + respond_to :html, :xml, :json def upload_tags @user = User.find(params[:user_id]) diff --git a/app/logical/reports/uploads.rb b/app/logical/reports/uploads.rb deleted file mode 100644 index 2fbfd0a72..000000000 --- a/app/logical/reports/uploads.rb +++ /dev/null @@ -1,26 +0,0 @@ -module Reports - class Uploads - attr_reader :min_date, :max_date, :queries - - def initialize(min_date, max_date, queries) - if min_date.present? - @min_date = min_date - else - @min_date = 30.days.ago.to_date - end - - if max_date.present? - @max_date = max_date - else - @max_date = Date.today - end - - @queries = queries.to_s.split(/,\s*/).join(",") - end - - def generate_sig - verifier = ActiveSupport::MessageVerifier.new(Danbooru.config.reportbooru_key, serializer: JSON, digest: "SHA256") - verifier.generate("#{min_date},#{max_date},#{queries}") - end - end -end diff --git a/app/views/reports/uploads.html.erb b/app/views/reports/uploads.html.erb deleted file mode 100644 index b3ca5a58d..000000000 --- a/app/views/reports/uploads.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -
-
-

Upload Report

- - <%= form_tag(reports_uploads_path, :method => :get, :class => "simple_form") do %> - -
- - <%= text_field_tag "queries", params[:queries], :placeholder => "Separate with commas" %> -
- -
- - <%= text_field_tag "min_date", params[:min_date], :placeholder => "YYYY-MM-DD" %> -
- -
- - <%= text_field_tag "max_date", params[:max_date], :placeholder => "YYYY-MM-DD" %> -
- - <%= submit_tag "Search" %> - <% end %> - - <% if params[:queries] %> - <%= content_tag("iframe", "Loading...", :src => "#{Danbooru.config.reportbooru_server}/reports/uploads?min=#{@report.min_date}&max=#{@report.max_date}&tags=#{u(@report.queries)}&sig=#{@report.generate_sig}", :height => "700", :width => "1200", :style => "border: none;") %> - <% end %> -
-
- -<% content_for(:page_title) do %> - Upload Report - <%= Danbooru.config.app_name %> -<% end %> diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb index f23a14566..8951e50ce 100644 --- a/app/views/static/site_map.html.erb +++ b/app/views/static/site_map.html.erb @@ -73,7 +73,6 @@