diff --git a/app/logical/sources/strategies/nijie.rb b/app/logical/sources/strategies/nijie.rb index 6e40fe384..b8f1fa478 100644 --- a/app/logical/sources/strategies/nijie.rb +++ b/app/logical/sources/strategies/nijie.rb @@ -102,7 +102,7 @@ module Sources # Can't use URI.join here because nijie urls may contain japanese characters images = images.map { |img| "https:#{img}" } - images = [url] if url.match?(IMAGE_URL) && images.empty? + images = [url] if images.empty? images.map(&method(:to_full_image_url)).uniq end diff --git a/test/functional/uploads_controller_test.rb b/test/functional/uploads_controller_test.rb index 3e0f6fa97..66dd62999 100644 --- a/test/functional/uploads_controller_test.rb +++ b/test/functional/uploads_controller_test.rb @@ -319,7 +319,7 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest should_upload_successfully("http://nijie.info/view.php?id=213043") should_upload_successfully("https://nijie.info/view_popup.php?id=213043") - should_upload_successfully("https://pic.nijie.net/03/nijie_picture/728995_20170505014820_0.jpg") + should_upload_successfully("https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg") should_upload_successfully("https://pawoo.net/web/statuses/1202176") if Danbooru.config.pawoo_client_id.present? # XXX should_upload_successfully("https://img.pawoo.net/media_attachments/files/000/128/953/original/4c0a06087b03343f.png") if Danbooru.config.pawoo_client_id.present? # XXX diff --git a/test/unit/sources/nijie_test.rb b/test/unit/sources/nijie_test.rb index 132a97717..1597044e0 100644 --- a/test/unit/sources/nijie_test.rb +++ b/test/unit/sources/nijie_test.rb @@ -285,10 +285,6 @@ module Sources assert_nil(site.artist_name) assert_nil(site.artist_commentary_desc) assert_nil(site.artist_commentary_title) - assert_nil(site.image_url) - assert_nil(site.preview_url) - assert_empty(site.image_urls) - assert_empty(site.preview_urls) assert_empty(site.tags) assert_nothing_raised { site.to_h } end @@ -314,7 +310,7 @@ module Sources Cache.put("nijie-session-cookie", { "NIJIEIJIEID" => "fake", "nijie_tok" => "fake" }) assert_equal({ "NIJIEIJIEID" => "fake", "nijie_tok" => "fake" }, site.cached_session_cookie) - assert_equal([], site.image_urls) + site.image_urls assert_nil(Cache.get("nijie-session-cookie")) end end