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

pawoo: fix www.pawoo.net urls not being normalized to pawoo.net.

Browse Source 
Fix artist URLs like https://www.pawoo.net/@01051708 not being normalized to https://pawoo.net/@01051708.
This commit is contained in:
evazion
2022-03-31 02:17:51 -05:00
parent 990d7f6380
commit 54cfbf84c6
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/logical/source/url/mastodon.rb
View File

@@ -13,40 +13,40 @@ class Source::URL::Mastodon < Source::URL
end
def parse
case [host, *path_segments]
case [subdomain, domain, *path_segments]
# https://pawoo.net/@evazion/19451018
# https://baraag.net/@curator/102270656480174153
in _, /^@/ => username, /^\d+$/ => work_id, *rest
in _, _, /^@/ => username, /^\d+$/ => work_id, *rest
@username = username.delete_prefix("@")
@work_id = work_id
# https://pawoo.net/@evazion
# https://baraag.net/@danbooru
# https://baraag.net/@quietvice/media
in _, /^@/ => username, *rest
in _, _, /^@/ => username, *rest
@username = username.delete_prefix("@")
# https://pawoo.net/users/esoraneko
# https://pawoo.net/users/khurata/media
in _, "users", username, *rest
in _, _, "users", username, *rest
@username = username
# https://pawoo.net/web/statuses/19451018
# https://pawoo.net/web/statuses/19451018/favorites
# https://baraag.net/web/statuses/102270656480174153
in _, "web", "statuses", work_id, *rest
in _, _, "web", "statuses", work_id, *rest
@work_id = work_id
# https://pawoo.net/web/accounts/47806
# https://baraag.net/web/accounts/107862785324786980
in _, "web", "accounts", user_id
in _, _, "web", "accounts", user_id
@user_id = user_id
# Page: https://pawoo.net/@evazion/19451018
# https://img.pawoo.net/media_attachments/files/001/297/997/small/c4272a09570757c2.png
# https://img.pawoo.net/media_attachments/files/001/297/997/original/c4272a09570757c2.png
in "img.pawoo.net", "media_attachments", "files", *subdirs, file_size, file
in "img", "pawoo.net", "media_attachments", "files", *subdirs, file_size, file
@file_size = file_size
@full_image_url = "#{site}/media_attachments/files/#{subdirs.join("/")}/original/#{file}"
@@ -54,12 +54,12 @@ class Source::URL::Mastodon < Source::URL
# https://baraag.net/system/media_attachments/files/107/866/084/749/942/932/original/a9e0f553e332f303.mp4
# https://baraag.net/system/media_attachments/files/107/866/084/754/127/256/original/3895a14ce3736f13.mp4
# https://baraag.net/system/media_attachments/files/107/866/084/754/651/925/original/8f3df857681a1639.png
in "baraag.net", "system", "media_attachments", "files", *subdirs, file_size, file
in _, "baraag.net", "system", "media_attachments", "files", *subdirs, file_size, file
@file_size = file_size
@full_image_url = "#{site}/system/media_attachments/files/#{subdirs.join("/")}/original/#{file}"
# https://pawoo.net/media/lU2uV7C1MMQSb1czwvg
in "pawoo.net", "media", media_hash
in _, "pawoo.net", "media", media_hash
@media_hash = media_hash
else
@@ -79,17 +79,17 @@ class Source::URL::Mastodon < Source::URL
def page_url
if username.present? && work_id.present?
"https://#{host}/@#{username}/#{work_id}"
"https://#{domain}/@#{username}/#{work_id}"
elsif work_id.present?
"https://#{host}/web/statuses/#{work_id}"
"https://#{domain}/web/statuses/#{work_id}"
end
end
def profile_url
if username.present?
"https://#{host}/@#{username}"
"https://#{domain}/@#{username}"
elsif user_id.present?
"https://#{host}/web/accounts/#{user_id}"
"https://#{domain}/web/accounts/#{user_id}"
end
end
end

4
test/unit/artist_url_test.rb
View File

@@ -179,11 +179,11 @@ class ArtistURLTest < ActiveSupport::TestCase
end
should "normalize pawoo.net urls" do
url = create(:artist_url, url: "http://pawoo.net/@evazion/19451018")
url = create(:artist_url, url: "http://www.pawoo.net/@evazion/19451018")
assert_equal("https://pawoo.net/@evazion", url.url)
assert_equal("http://pawoo.net/@evazion/", url.normalized_url)
url = create(:artist_url, url: "http://pawoo.net/users/evazion/media")
url = create(:artist_url, url: "http://www.pawoo.net/users/evazion/media")
assert_equal("https://pawoo.net/@evazion", url.url)
assert_equal("http://pawoo.net/@evazion/", url.normalized_url)
end