From 56ee44dc0091b8342c64e7627149effcfde93005 Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Wed, 20 Jun 2018 09:48:46 -0700 Subject: [PATCH] fixes to iqdb queries --- app/controllers/iqdb_queries_controller.rb | 8 ++++++-- config/routes.rb | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/iqdb_queries_controller.rb b/app/controllers/iqdb_queries_controller.rb index e6950e4f6..ab3079ec0 100644 --- a/app/controllers/iqdb_queries_controller.rb +++ b/app/controllers/iqdb_queries_controller.rb @@ -3,14 +3,18 @@ class IqdbQueriesController < ApplicationController def show if params[:url] - url = URI::HTTP.build(host: Danbooru.config.iqdbs_server, path: "/similar", query: URI.encode_www_form({callback: iqdb_queries_url, url: params[:url]})) + url = URI.parse(Danbooru.config.iqdbs_server) + url.path = "/similar" + url.query = {callback: iqdb_queries_url, url: params[:url]}.to_query redirect_to url.to_s return end if params[:post_id] post = Post.find(params[:post_id]) - url = URI::HTTP.build(host: Danbooru.config.iqdbs_server, path: "/similar", query: URI.encode_www_form({callback: iqdb_queries_url, url: post.preview_file_url})) + url = URI.parse(Danbooru.config.iqdbs_server) + url.path = "/similar" + url.query = {callback: iqdb_queries_url, url: post.preview_file_url}.to_query redirect_to url.to_s return end diff --git a/config/routes.rb b/config/routes.rb index 5e713c386..8c1ff8c89 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -154,7 +154,11 @@ Rails.application.routes.draw do resource :visit, :controller => "forum_topic_visits" end resources :ip_bans - resource :iqdb_queries, :only => [:show] + resource :iqdb_queries, :only => [:show] do + collection do + get :check, to: redirect {|path_params, req| "/iqdb_queries?#{req.query_string}"} + end + end resources :janitor_trials do collection do get :test