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

tumblr: fix exception when parsing subdomainless Tumblr URLs.

Browse Source 
Fix exception when a post has a Tumblr source without a subdomain, such
as `https://tumblr.com`.
This commit is contained in:
evazion
2022-08-30 01:52:55 -05:00
parent cf13ab1540
commit 2b76a4c5ba
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/source/url/tumblr.rb
View File

@@ -77,7 +77,7 @@ class Source::URL::Tumblr < Source::URL
# http://data.tumblr.com/07e7bba538046b2b586433976290ee1f/tumblr_o3gg44HcOg1r9pi29o1_raw.jpg
# https://40.media.tumblr.com/de018501416a465d898d24ad81d76358/tumblr_nfxt7voWDX1rsd4umo1_r23_1280.jpg
# https://va.media.tumblr.com/tumblr_pgohk0TjhS1u7mrsl.mp4
subdomain.ends_with?(".media") || subdomain.in?(%w[data media])
subdomain&.ends_with?(".media") || subdomain&.in?(%w[data media])
end
def variants

10
test/unit/sources/tumblr_test.rb
View File

@@ -259,5 +259,15 @@ module Sources
assert_nil(Source::URL.page_url("https://octrain1020.tumblr.com/"))
end
end
should "parse Tumblr URLs correctly" do
refute(Source::URL.image_url?("https://tumblr.com"))
refute(Source::URL.image_url?("https://www.tumblr.com"))
refute(Source::URL.image_url?("https://yogurtmedia.tumblr.com/post/45732863347"))
assert(Source::URL.image_url?("http://data.tumblr.com/07e7bba538046b2b586433976290ee1f/tumblr_o3gg44HcOg1r9pi29o1_raw.jpg"))
assert(Source::URL.image_url?("https://40.media.tumblr.com/de018501416a465d898d24ad81d76358/tumblr_nfxt7voWDX1rsd4umo1_r23_1280.jpg"))
assert(Source::URL.image_url?("https://va.media.tumblr.com/tumblr_pgohk0TjhS1u7mrsl.mp4"))
end
end
end