Improve detection and handling of yt redirect links

This commit is contained in:
syeopite 2021-09-03 12:28:34 -07:00
parent a28945273d
commit 387bddb51b
No known key found for this signature in database
GPG key ID: 6FA616E5A5294A82

View file

@ -480,9 +480,9 @@ def replace_links(html)
html.xpath_nodes(%q(//a)).each do |anchor| html.xpath_nodes(%q(//a)).each do |anchor|
url = URI.parse(anchor["href"]) url = URI.parse(anchor["href"])
if {"www.youtube.com", "m.youtube.com", "youtu.be"}.includes?(url.host) if url.host.nil? || url.host.not_nil!.ends_with?("youtube.com") || url.host.not_nil!.ends_with?("youtu.be")
if url.host == "youtu.be" if url.host.try &.ends_with? "youtu.be"
url = "/watch?v=#{url.request_target.lstrip('/')}" url = "/watch?v=#{url.path.lstrip('/')}#{url.query_params}"
else else
if url.path == "/redirect" if url.path == "/redirect"
params = HTTP::Params.parse(url.query.not_nil!) params = HTTP::Params.parse(url.query.not_nil!)
@ -558,7 +558,7 @@ def content_to_comment_html(content)
if url.host == "youtu.be" if url.host == "youtu.be"
url = "/watch?v=#{url.request_target.lstrip('/')}" url = "/watch?v=#{url.request_target.lstrip('/')}"
elsif !url.host || {"m.youtube.com", "www.youtube.com"}.includes? url.host elsif url.host.nil? || url.host.not_nil!.ends_with?("youtube.com")
if url.path == "/redirect" if url.path == "/redirect"
url = HTTP::Params.parse(url.query.not_nil!)["q"] url = HTTP::Params.parse(url.query.not_nil!)["q"]
else else