From 32f4cb12365df752f19dc14d9ec609921a5c29d0 Mon Sep 17 00:00:00 2001 From: nonamethanks Date: Fri, 4 Dec 2020 00:17:02 +0100 Subject: [PATCH] Fix blog.fc2 urls matching wrong artists --- app/logical/artist_finder.rb | 1 + app/models/artist_url.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/logical/artist_finder.rb b/app/logical/artist_finder.rb index 306f05fc9..49e619f9b 100644 --- a/app/logical/artist_finder.rb +++ b/app/logical/artist_finder.rb @@ -44,6 +44,7 @@ module ArtistFinder "fantia.jp/fanclubs", # https://fantia.jp/fanclubs/1711 "fav.me", # http://fav.me/d9y1njg /blog-imgs-\d+(?:-origin)?\.fc2\.com/i, + %r{blog\.fc2\.com(/\w)+/?}i, # http://blog71.fc2.com/a/abk00/file/20080220194219.jpg "furaffinity.net", "furaffinity.net/user", # http://www.furaffinity.net/user/achthenuts "gelbooru.com", # http://gelbooru.com/index.php?page=account&s=profile&uname=junou diff --git a/app/models/artist_url.rb b/app/models/artist_url.rb index b4e4d9af5..5a9ac4b48 100644 --- a/app/models/artist_url.rb +++ b/app/models/artist_url.rb @@ -20,9 +20,9 @@ class ArtistUrl < ApplicationRecord nil else url = url.sub(%r!^https://!, "http://") - url = url.sub(%r!^http://blog\d+\.fc2!, "http://blog.fc2") url = url.sub(%r!^http://blog-imgs-\d+\.fc2!, "http://blog.fc2") url = url.sub(%r!^http://blog-imgs-\d+-\w+\.fc2!, "http://blog.fc2") + url = url.sub(%r!^http://blog\d*\.fc2\.com/(?:\w/){,3}(\w+)!, "http://\\1.blog.fc2.com") url = url.sub(%r!^http://pictures.hentai-foundry.com//!, "http://pictures.hentai-foundry.com/") # the strategy won't always work for twitter because it looks for a status