From e262295cf1921215e85668bbd7274cec325e334e Mon Sep 17 00:00:00 2001
From: Albert Yi <albert@carbonfive.com>
Date: Wed, 20 Jun 2018 11:53:44 -0700
Subject: [PATCH] support json for iqdb query actions

---
 app/controllers/iqdb_queries_controller.rb    |  6 +++---
 app/views/iqdb_queries/create_by_post.js.erb  | 10 ----------
 app/views/iqdb_queries/create_by_url.html.erb |  9 ---------
 app/views/iqdb_queries/show.json.erb          |  3 +++
 4 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 app/views/iqdb_queries/create_by_post.js.erb
 delete mode 100644 app/views/iqdb_queries/create_by_url.html.erb
 create mode 100644 app/views/iqdb_queries/show.json.erb

diff --git a/app/controllers/iqdb_queries_controller.rb b/app/controllers/iqdb_queries_controller.rb
index ab3079ec0..1485acf00 100644
--- a/app/controllers/iqdb_queries_controller.rb
+++ b/app/controllers/iqdb_queries_controller.rb
@@ -1,11 +1,11 @@
 class IqdbQueriesController < ApplicationController
-  respond_to :html, :json, :xml
+  respond_to :html, :json
 
   def show
     if params[:url]
       url = URI.parse(Danbooru.config.iqdbs_server)
       url.path = "/similar"
-      url.query = {callback: iqdb_queries_url, url: params[:url]}.to_query
+      url.query = {callback: iqdb_queries_url(format: params[:format]), url: params[:url]}.to_query
       redirect_to url.to_s
       return
     end
@@ -14,7 +14,7 @@ class IqdbQueriesController < ApplicationController
       post = Post.find(params[:post_id])
       url = URI.parse(Danbooru.config.iqdbs_server)
       url.path = "/similar"
-      url.query = {callback: iqdb_queries_url, url: post.preview_file_url}.to_query
+      url.query = {callback: iqdb_queries_url(format: params[:format]), url: post.preview_file_url}.to_query
       redirect_to url.to_s
       return      
     end
diff --git a/app/views/iqdb_queries/create_by_post.js.erb b/app/views/iqdb_queries/create_by_post.js.erb
deleted file mode 100644
index 1877d32a4..000000000
--- a/app/views/iqdb_queries/create_by_post.js.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-var html = '';
-<% if @results.any? %>
-  <% @results.each do |match| %>
-    html += '<%= j PostPresenter.preview(match[:post], :tags => "status:any") %>';
-  <% end %>
-<% else %>
-  html += '<p>No matches found</p>';
-<% end %>
-
-$("<div></div>").html(html).dialog({title: "Similar Posts", modal: true, width: "600px"});
diff --git a/app/views/iqdb_queries/create_by_url.html.erb b/app/views/iqdb_queries/create_by_url.html.erb
deleted file mode 100644
index 91cb2ab24..000000000
--- a/app/views/iqdb_queries/create_by_url.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if @results.any? %>
-  <h3>Similar</h3>
-  <% @results.each do |match| %>
-    <%= PostPresenter.preview(match[:post], :tags => "status:any", :size => true, :similarity => match[:score]) %>
-  <% end %>
-<% else %>
-  <h3>Similar</h3>
-  <p>No matches found</p>
-<% end %>
diff --git a/app/views/iqdb_queries/show.json.erb b/app/views/iqdb_queries/show.json.erb
new file mode 100644
index 000000000..04451bf99
--- /dev/null
+++ b/app/views/iqdb_queries/show.json.erb
@@ -0,0 +1,3 @@
+<% if @matches %>
+  <%= raw @matches.to_json %>
+<% end %>