jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nijie: fix uploads not working for new image URL format.

Browse Source 
Fix uploads not working for image URLs like this:

    https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg
This commit is contained in:
evazion
2022-02-15 20:16:49 -06:00
parent a14cd3cd8b
commit 9a5a04d74e
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/sources/strategies/nijie.rb
View File

@@ -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

2
test/functional/uploads_controller_test.rb
View File

@@ -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

6
test/unit/sources/nijie_test.rb
View File

@@ -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