diff --git a/app/logical/source/url/pixiv.rb b/app/logical/source/url/pixiv.rb index c6d91fd55..40ea4d0ec 100644 --- a/app/logical/source/url/pixiv.rb +++ b/app/logical/source/url/pixiv.rb @@ -7,7 +7,7 @@ module Source def self.match?(url) return false if Source::URL::Fanbox.match?(url) || Source::URL::PixivSketch.match?(url) || Source::URL::Booth.match?(url) - url.domain.in?(%w[pximg.net pixiv.net pixiv.me pixiv.cc]) || url.host == "tc-pximg01.techorus-cdn.com" + url.domain.in?(%w[pximg.net pixiv.net pixiv.me pixiv.cc]) end def parse @@ -22,7 +22,6 @@ module Source # https://i-f.pximg.net/img-original/img/2020/02/19/00/40/18/79584713_p0.png # http://i1.pixiv.net/img-inf/img/2011/05/01/23/28/04/18557054_64x64.jpg # http://i1.pixiv.net/img-inf/img/2011/05/01/23/28/04/18557054_s.png - # https://tc-pximg01.techorus-cdn.com/img-original/img/2017/09/18/03/18/24/65015428_p4.png # # but not: # @@ -123,10 +122,9 @@ module Source def image_url? # https://i.pximg.net/img-original/img/2014/10/03/18/10/20/46324488_p0.png # https://i-f.pximg.net/img-original/img/2020/02/19/00/40/18/79584713_p0.png - # https://tc-pximg01.techorus-cdn.com/img-original/img/2017/09/18/03/18/24/65015428_p4.png # https://i2.pixiv.net/img04/img/syounen_no_uta/46170939_p0.jpg # http://img18.pixiv.net/img/evazion/14901720.png - host.in?(["i.pximg.net", "i-f.pximg.net", "tc-pximg01.techorus-cdn.com"]) || host.match?(/\A(i\d+|img\d+)\.pixiv\.net\z/) + host.in?(%w[i.pximg.net i-f.pximg.net]) || host.match?(/\A(i\d+|img\d+)\.pixiv\.net\z/) end def full_image_url? diff --git a/test/unit/sources/pixiv_test.rb b/test/unit/sources/pixiv_test.rb index 4c6f035ad..2269d5ef7 100644 --- a/test/unit/sources/pixiv_test.rb +++ b/test/unit/sources/pixiv_test.rb @@ -59,15 +59,6 @@ module Sources end end - context "A https://tc-pximg01.techorus-cdn.com/img-original/img/* source" do - should "get the metadata" do - @site = Source::Extractor.find("https://tc-pximg01.techorus-cdn.com/img-original/img/2017/09/18/03/18/24/65015428_p4.png") - - assert_equal(["https://i.pximg.net/img-original/img/2017/09/18/03/18/24/65015428_p4.png"], @site.image_urls) - assert_equal("赤井さしみ", @site.artist_name) - end - end - context "A https://www.pixiv.net/*/artworks/* source" do should "work" do @site = Source::Extractor.find("https://www.pixiv.net/en/artworks/64476642") @@ -332,8 +323,6 @@ module Sources context "parsing illust ids" do should "parse ids from illust urls" do - assert_illust_id(65015428, "https://tc-pximg01.techorus-cdn.com/img-original/img/2017/09/18/03/18/24/65015428_p4.png") - assert_illust_id(46785915, "https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/10/29/09/27/19/46785915_p0_square1200.jpg") assert_illust_id(79584713, "https://i-f.pximg.net/img-original/img/2020/02/19/00/40/18/79584713_p0.png") @@ -389,7 +378,6 @@ module Sources assert(Source::URL.image_url?("https://i.pximg.net/c/250x250_80_a2/img-master/img/2014/10/29/09/27/19/46785915_p0_square1200.jpg")) assert(Source::URL.image_url?("https://i-f.pximg.net/img-original/img/2020/02/19/00/40/18/79584713_p0.png")) assert(Source::URL.image_url?("http://i1.pixiv.net/img-inf/img/2011/05/01/23/28/04/18557054_64x64.jpg")) - assert(Source::URL.image_url?("https://tc-pximg01.techorus-cdn.com/img-original/img/2017/09/18/03/18/24/65015428_p4.png")) assert(Source::URL.image_url?("http://img18.pixiv.net/img/evazion/14901720.png")) assert(Source::URL.image_url?("http://i2.pixiv.net/img18/img/evazion/14901720.png"))