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

Fix Pixiv user profile URL to use the latest format

Browse Source 
This will only affect new artist and commentary records going forward.
This commit is contained in:
BrokenEagle
2020-06-17 06:22:29 +00:00
parent 05f9b78ee3
commit 158a4aa916
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ module Sources
text = text.gsub(%r{https?://www\.pixiv\.net/member\.php\?id=([0-9]+)}i) do |_match| text = text.gsub(%r{https?://www\.pixiv\.net/member\.php\?id=([0-9]+)}i) do |_match|
member_id = $1 member_id = $1
profile_url = "https://www.pixiv.net/member.php?id=#{member_id}" profile_url = "https://www.pixiv.net/users/#{member_id}"
search_params = {"search[url_matches]" => profile_url}.to_param search_params = {"search[url_matches]" => profile_url}.to_param
%("user/#{member_id}":[#{profile_url}] "»":[/artists?#{search_params}]) %("user/#{member_id}":[#{profile_url}] "»":[/artists?#{search_params}])
@@ -155,7 +155,7 @@ module Sources
end end
end end
"https://www.pixiv.net/member.php?id=#{metadata.user_id}" "https://www.pixiv.net/users/#{metadata.user_id}"
rescue PixivApiClient::BadIDError rescue PixivApiClient::BadIDError
nil nil
end end

8
test/unit/sources/pixiv_test.rb
View File

@@ -78,7 +78,7 @@ module Sources
@site = Sources::Strategies.find("http://www.pixiv.net/fanbox/creator/554149/post/82555") @site = Sources::Strategies.find("http://www.pixiv.net/fanbox/creator/554149/post/82555")
assert_equal("TYONE(お仕事募集中)", @site.artist_name) assert_equal("TYONE(お仕事募集中)", @site.artist_name)
assert_equal("https://www.pixiv.net/member.php?id=554149", @site.profile_url) assert_equal("https://www.pixiv.net/users/554149", @site.profile_url)
assert_equal("https://fanbox.pixiv.net/images/post/82555/Lyyeb6dDLcQZmy09nqLZapuS.jpeg", @site.image_url) assert_equal("https://fanbox.pixiv.net/images/post/82555/Lyyeb6dDLcQZmy09nqLZapuS.jpeg", @site.image_url)
assert_nothing_raised { @site.to_h } assert_nothing_raised { @site.to_h }
end end
@@ -104,7 +104,7 @@ module Sources
end end
should "get the profile" do should "get the profile" do
assert_equal("https://www.pixiv.net/member.php?id=696859", @site.profile_url) assert_equal("https://www.pixiv.net/users/696859", @site.profile_url)
end end
should "get the artist name" do should "get the artist name" do
@@ -205,7 +205,7 @@ module Sources
should "convert illust links and member links to dtext" do should "convert illust links and member links to dtext" do
get_source("https://www.pixiv.net/member_illust.php?mode=medium&illust_id=63421642") get_source("https://www.pixiv.net/member_illust.php?mode=medium&illust_id=63421642")
dtext_desc = %(foo 【pixiv #46337015 "»":[/posts?tags=pixiv:46337015]】bar 【pixiv #14901720 "»":[/posts?tags=pixiv:14901720]】\n\nbaz【"user/83739":[https://www.pixiv.net/member.php?id=83739] "»":[/artists?search%5Burl_matches%5D=https%3A%2F%2Fwww.pixiv.net%2Fmember.php%3Fid%3D83739]】) dtext_desc = %(foo 【pixiv #46337015 "»":[/posts?tags=pixiv:46337015]】bar 【pixiv #14901720 "»":[/posts?tags=pixiv:14901720]】\n\nbaz【"user/83739":[https://www.pixiv.net/users/83739] "»":[/artists?search%5Burl_matches%5D=https%3A%2F%2Fwww.pixiv.net%2Fusers%2F83739]】)
assert_equal(dtext_desc, @site.dtext_artist_commentary_desc) assert_equal(dtext_desc, @site.dtext_artist_commentary_desc)
end end
end end
@@ -293,7 +293,7 @@ module Sources
assert_equal("uroobnad", source.tag_name) assert_equal("uroobnad", source.tag_name)
assert_equal(["uroobnad"], source.other_names) assert_equal(["uroobnad"], source.other_names)
assert_includes(source.profile_urls, "https://www.pixiv.net/member.php?id=696859") assert_includes(source.profile_urls, "https://www.pixiv.net/users/696859")
assert_includes(source.profile_urls, "https://www.pixiv.net/stacc/uroobnad") assert_includes(source.profile_urls, "https://www.pixiv.net/stacc/uroobnad")
end end
end end