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

Fix #5234: Weibo URLs get normalized incorrectly in some cases.

Browse Source
This commit is contained in:
evazion
2022-08-24 14:47:00 -05:00
parent c2597ff299
commit f46134e87f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/logical/source/url/weibo.rb
View File

@@ -9,9 +9,9 @@
# http://blog.sina.com.cn/u/1299088063 # http://blog.sina.com.cn/u/1299088063
class Source::URL::Weibo < Source::URL class Source::URL::Weibo < Source::URL
RESERVED_USERNAMES = %w[u p profile status detail] RESERVED_USERNAMES = %w[u n p profile status detail]
attr_reader :full_image_url, :artist_short_id, :artist_long_id, :username attr_reader :full_image_url, :artist_short_id, :artist_long_id, :display_name, :username
def self.match?(url) def self.match?(url)
url.domain.in?(["weibo.com", "weibo.cn", "sinaimg.cn"]) url.domain.in?(["weibo.com", "weibo.cn", "sinaimg.cn"])
@@ -74,6 +74,11 @@ class Source::URL::Weibo < Source::URL
in _, /^\d+$/ => artist_short_id, *rest in _, /^\d+$/ => artist_short_id, *rest
@artist_short_id = artist_short_id @artist_short_id = artist_short_id
# https://weibo.com/n/肆巳4
# https://www.weibo.com/n/小小男爵不要坑
in _, "n", display_name, *rest
@display_name = display_name
# https://www.weibo.com/endlessnsmt (short id: https://www.weibo.com/u/1879370780) # https://www.weibo.com/endlessnsmt (short id: https://www.weibo.com/u/1879370780)
# https://www.weibo.cn/endlessnsmt # https://www.weibo.cn/endlessnsmt
# https://www.weibo.com/lvxiuzi0/home # https://www.weibo.com/lvxiuzi0/home
@@ -94,6 +99,8 @@ class Source::URL::Weibo < Source::URL
"https://www.weibo.com/u/#{artist_short_id}" "https://www.weibo.com/u/#{artist_short_id}"
elsif artist_long_id.present? elsif artist_long_id.present?
"https://www.weibo.com/p/#{artist_long_id}" "https://www.weibo.com/p/#{artist_long_id}"
elsif display_name.present?
"https://www.weibo.com/n/#{display_name}"
elsif username.present? elsif username.present?
"https://www.weibo.com/#{username}" "https://www.weibo.com/#{username}"
end end

1
test/unit/sources/weibo_test.rb
View File

@@ -138,6 +138,7 @@ module Sources
assert(Source::URL.profile_url?("https://www.weibo.com/5501756072")) assert(Source::URL.profile_url?("https://www.weibo.com/5501756072"))
assert(Source::URL.profile_url?("https://www.weibo.com/endlessnsmt")) assert(Source::URL.profile_url?("https://www.weibo.com/endlessnsmt"))
assert(Source::URL.profile_url?("https://www.weibo.com/4ubergine/photos")) assert(Source::URL.profile_url?("https://www.weibo.com/4ubergine/photos"))
assert(Source::URL.profile_url?("https://www.weibo.com/n/小小男爵不要坑"))
refute(Source::URL.profile_url?("https://weibo.com/u/")) refute(Source::URL.profile_url?("https://weibo.com/u/"))
end end