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

Fix #4440: Whitespace not trimmed when searching by URL in Artists.

Browse Source
This commit is contained in:
evazion
2020-05-04 03:36:26 -05:00
parent 5feb29ba57
commit 86e3bd8fbc
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/artist.rb
View File

@@ -222,6 +222,8 @@ class Artist < ApplicationRecord
end end
def url_matches(query) def url_matches(query)
query = query.strip
if query =~ %r!\A/(.*)/\z! if query =~ %r!\A/(.*)/\z!
where(id: ArtistUrl.where_regex(:url, $1).select(:artist_id)) where(id: ArtistUrl.where_regex(:url, $1).select(:artist_id))
elsif query.include?("*") elsif query.include?("*")
@@ -234,6 +236,8 @@ class Artist < ApplicationRecord
end end
def any_name_or_url_matches(query) def any_name_or_url_matches(query)
query = query.strip
if query =~ %r!\Ahttps?://!i if query =~ %r!\Ahttps?://!i
url_matches(query) url_matches(query)
else else

6
test/functional/artists_controller_test.rb
View File

@@ -142,6 +142,12 @@ class ArtistsControllerTest < ActionDispatch::IntegrationTest
get artists_path(search: { url_matches: url }, format: "json") get artists_path(search: { url_matches: url }, format: "json")
assert_artist_found("masao") assert_artist_found("masao")
end end
should "ignore whitespace when searching by URL" do
url = " http://www.pixiv.net/member_illust.php?mode=medium&illust_id=46170939 "
get artists_path(search: { url_matches: url }, format: "json")
assert_artist_found("masao")
end
end end
end end