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

nijie: fix page_url method.

Browse Source 
The id in a bare image url is the member id, not the illust id.
This commit is contained in:
evazion
2018-09-23 12:11:14 -05:00
parent b4cf423058
commit b6228505aa
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,10 +41,6 @@ module Sources
if x =~ %r!https?://nijie\.info/view_popup\.php.+id=(\d+)! if x =~ %r!https?://nijie\.info/view_popup\.php.+id=(\d+)!
return "https://nijie.info/view.php?id=#{$1}" return "https://nijie.info/view.php?id=#{$1}"
end end
if x =~ %r!\Ahttps?://pic\d+\.nijie\.info/nijie_picture/(\d+)!
return "https://nijie.info/view.php?id=#{$1}"
end
end end
return super return super

2
test/unit/artist_url_test.rb
View File

@@ -164,7 +164,7 @@ class ArtistUrlTest < ActiveSupport::TestCase
should "normalize nijie urls" do should "normalize nijie urls" do
url = FactoryBot.create(:artist_url, url: "https://pic03.nijie.info/nijie_picture/236014_20170620101426_0.png") url = FactoryBot.create(:artist_url, url: "https://pic03.nijie.info/nijie_picture/236014_20170620101426_0.png")
assert_equal("http://nijie.info/members.php?id=161703/", url.normalized_url) assert_equal("http://nijie.info/members.php?id=236014/", url.normalized_url)
url = FactoryBot.create(:artist_url, url: "https://nijie.info/members.php?id=161703") url = FactoryBot.create(:artist_url, url: "https://nijie.info/members.php?id=161703")
assert_equal("http://nijie.info/members.php?id=161703/", url.normalized_url) assert_equal("http://nijie.info/members.php?id=161703/", url.normalized_url)

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

@@ -121,5 +121,17 @@ module Sources
assert_equal(desc, @site.dtext_artist_commentary_desc) assert_equal(desc, @site.dtext_artist_commentary_desc)
end end
end end
context "The source site for a nijie image url without referer" do
should "get the correct urls" do
image_url = "https://pic03.nijie.info/nijie_picture/236014_20170620101426_0.png"
site = Sources::Strategies.find(image_url)
assert_nil(site.page_url)
assert_equal(image_url, site.image_url)
assert_equal(image_url, site.canonical_url)
assert_equal("https://nijie.info/members.php?id=236014", site.profile_url)
end
end
end end
end end