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

Don't return incorrect artist finder results

Browse Source 
Applies to nicoseiga, tumblr, and deviantart; fixes #2134
This commit is contained in:
Toks
2014-04-28 15:01:07 -04:00
parent b16980be51
commit 22f2a76569
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/artist.rb
View File

@@ -30,7 +30,10 @@ class Artist < ActiveRecord::Base
u = u.to_escaped_for_sql_like.gsub(/\*/, '%') + '%' u = u.to_escaped_for_sql_like.gsub(/\*/, '%') + '%'
artists += Artist.joins(:urls).where(["artists.is_active = TRUE AND artist_urls.normalized_url LIKE ? ESCAPE E'\\\\'", u]).limit(10).order("artists.name").all artists += Artist.joins(:urls).where(["artists.is_active = TRUE AND artist_urls.normalized_url LIKE ? ESCAPE E'\\\\'", u]).limit(10).order("artists.name").all
url = File.dirname(url) + "/" url = File.dirname(url) + "/"
break if url =~ /pixiv\.net\/(?:img\/)?$/ break if url =~ /pixiv\.net\/(?:img\/)?$/i
break if url =~ /lohas\.nicoseiga\.jp\/priv\/$/i
break if url =~ /media\.tumblr\.com\/[a-z0-9]+\/$/i
break if url =~ /deviantart\.net\//i
end end
artists.inject({}) {|h, x| h[x.name] = x; h}.values.slice(0, 20) artists.inject({}) {|h, x| h[x.name] = x; h}.values.slice(0, 20)