diff --git a/app/models/artist_url.rb b/app/models/artist_url.rb index 9b445ecf6..8612ed3fb 100644 --- a/app/models/artist_url.rb +++ b/app/models/artist_url.rb @@ -45,35 +45,6 @@ class ArtistUrl < ApplicationRecord end end - def self.legacy_normalize(url) - if url.nil? - nil - else - url = url.gsub(%r!^https://!, "http://") - url = url.gsub(%r!^http://blog\d+\.fc2!, "http://blog.fc2") - url = url.gsub(%r!^http://blog-imgs-\d+\.fc2!, "http://blog.fc2") - url = url.gsub(%r!^http://blog-imgs-\d+-\w+\.fc2!, "http://blog.fc2") - url = url.gsub(%r!^http://img\d+\.pixiv\.net!, "http://img.pixiv.net") - url = url.gsub(%r!^http://i\d+\.pixiv\.net/img\d+!, "http://img.pixiv.net") - url = url.gsub(%r!/+\Z!, "") - url + "/" - end - end - - def self.normalize_for_search(url) - if url =~ /\.\w+\Z/ && url =~ /\w\/\w/ - url = File.dirname(url) - end - - url = url.gsub(%r!^https://!, "http://") - url = url.gsub(%r!^http://blog\d+\.fc2!, "http://blog*.fc2") - url = url.gsub(%r!^http://blog-imgs-\d+\.fc2!, "http://blog*.fc2") - url = url.gsub(%r!^http://blog-imgs-\d+-\w+\.fc2!, "http://blog*.fc2") - url = url.gsub(%r!^http://img\d+\.pixiv\.net!, "http://img*.pixiv.net") - url = url.gsub(%r!^http://i\d+\.pixiv\.net/img\d+!, "http://*.pixiv.net/img*") - url - end - def parse_prefix case url when /^-/ diff --git a/app/models/artist_version.rb b/app/models/artist_version.rb index b80f66d37..6bd8e4979 100644 --- a/app/models/artist_version.rb +++ b/app/models/artist_version.rb @@ -60,10 +60,6 @@ class ArtistVersion < ApplicationRecord new_urls = url_array old_urls = version.present? ? version.url_array : [] - latest_urls = latest_urls.map {|url| ArtistUrl.legacy_normalize(url)} - new_urls = new_urls.map {|url| ArtistUrl.legacy_normalize(url)} - old_urls = old_urls.map {|url| ArtistUrl.legacy_normalize(url)} - added_urls = new_urls - old_urls removed_urls = old_urls - new_urls diff --git a/app/views/artists/_summary.html.erb b/app/views/artists/_summary.html.erb index bcbeaad23..e9eb006d3 100644 --- a/app/views/artists/_summary.html.erb +++ b/app/views/artists/_summary.html.erb @@ -33,9 +33,6 @@ <% else %> <%= h(url.url) %> <% end %> - <% if CurrentUser.user.is_moderator? %> - [<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{artist.name} source:#{ArtistUrl.normalize_for_search(url.url)}", :consequent => artist.name)) %>] - <% end %> <% end %>