jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4481 from BrokenEagle/fix-iqdb-image-url

Browse Source 
Adds suport for using the image_url parameter with IQDB
This commit is contained in:
evazion
2020-05-25 02:20:55 -05:00
committed by GitHub
parent e22e403bac b9b1177832
commit c300b344de
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/iqdb_queries_controller.rb
View File

@@ -3,7 +3,7 @@ class IqdbQueriesController < ApplicationController
def show def show
# XXX allow bare search params for backwards compatibility. # XXX allow bare search params for backwards compatibility.
search_params.merge!(params.slice(:url, :image_url, :post_id, :limit, :similarity, :high_similarity).permit!) search_params.merge!(params.slice(:url, :image_url, :file_url, :post_id, :limit, :similarity, :high_similarity).permit!)
@high_similarity_matches, @low_similarity_matches, @matches = IqdbProxy.search(search_params) @high_similarity_matches, @low_similarity_matches, @matches = IqdbProxy.search(search_params)
respond_with(@matches, template: "iqdb_queries/show") respond_with(@matches, template: "iqdb_queries/show")

5
app/logical/iqdb_proxy.rb
View File

@@ -25,7 +25,10 @@ class IqdbProxy
file = download(params[:url], :preview_url) file = download(params[:url], :preview_url)
results = query(file: file, limit: limit) results = query(file: file, limit: limit)
elsif params[:image_url].present? elsif params[:image_url].present?
file = download(params[:image_url], :image_url) file = download(params[:image_url], :url)
results = query(file: file, limit: limit)
elsif params[:file_url].present?
file = download(params[:file_url], :file_url)
results = query(file: file, limit: limit) results = query(file: file, limit: limit)
elsif params[:post_id].present? elsif params[:post_id].present?
url = Post.find(params[:post_id]).preview_file_url url = Post.find(params[:post_id]).preview_file_url