From 9dfaad7c985dd205177e2954ed48b19e70f41220 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 11 Aug 2015 13:48:19 -0700 Subject: [PATCH] fixes #2489: Hentai-Foundry image source update for artist finder --- app/models/post.rb | 2 +- test/unit/post_test.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/post.rb b/app/models/post.rb index 1d286c2e0..42d495cc0 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -358,7 +358,7 @@ class Post < ActiveRecord::Base when %r{\Ahttp://p\.twpl\.jp/show/orig/([a-z0-9]+)}i "http://p.twipple.jp/#{$1}" - when %r{\Ahttps?://pictures\.hentai-foundry\.com//[^/]/([^/]+)/(\d+)\.}i + when %r{\Ahttps?://pictures\.hentai-foundry\.com//?[^/]/([^/]+)/(\d+)\.}i "http://www.hentai-foundry.com/pictures/user/#{$1}/#{$2}" when %r{\Ahttp://blog(?:(?:-imgs-)?\d*(?:-origin)?)?\.fc2\.com/(?:(?:[^/]/){3}|(?:[^/]/))([^/]+)/(?:file/)?([^\.]+\.[^\?]+)}i diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb index 2df454d79..d400cedfe 100644 --- a/test/unit/post_test.rb +++ b/test/unit/post_test.rb @@ -959,6 +959,9 @@ class PostTest < ActiveSupport::TestCase should "normalize hentai foundry links" do @post.source = "http://pictures.hentai-foundry.com//a/AnimeFlux/219123.jpg" assert_equal("http://www.hentai-foundry.com/pictures/user/AnimeFlux/219123", @post.normalized_source) + + @post.source = "http://pictures.hentai-foundry.com/a/AnimeFlux/219123.jpg" + assert_equal("http://www.hentai-foundry.com/pictures/user/AnimeFlux/219123", @post.normalized_source) end end end