From 22f2a76569c3e19302d9639ce10be53568bd3919 Mon Sep 17 00:00:00 2001 From: Toks Date: Mon, 28 Apr 2014 15:01:07 -0400 Subject: [PATCH] Don't return incorrect artist finder results Applies to nicoseiga, tumblr, and deviantart; fixes #2134 --- app/models/artist.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/artist.rb b/app/models/artist.rb index e81ada8d6..3f890a95b 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -30,7 +30,10 @@ class Artist < ActiveRecord::Base 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 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 artists.inject({}) {|h, x| h[x.name] = x; h}.values.slice(0, 20)