Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-12-25 23:39:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update links related to youtube.com

Browse Source 
Following comment at :
- https://github.com/iv-org/invidious/pull/2936#discussion_r814435888
This commit is contained in:
Féry Mathieu (Mathius) 2022-02-25 21:07:12 +01:00
parent 0f1bb3fb3b
commit 420c458b6a
No known key found for this signature in database
GPG Key ID: F9CCC80C18A59037
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/invidious/comments.cr
View File

@ -573,10 +573,11 @@ def content_to_comment_html(content)
if run["navigationEndpoint"]? if run["navigationEndpoint"]?
if url = run["navigationEndpoint"]["urlEndpoint"]?.try &.["url"].as_s if url = run["navigationEndpoint"]["urlEndpoint"]?.try &.["url"].as_s
base_url = URI.parse(url)
url = URI.parse(url) url = URI.parse(url)
if url.host == "youtu.be" if url.host == "youtu.be"
url = "/watch?v=#{url.request_target.lstrip('/')}" url = "youtube.com/watch?v=#{url.request_target.lstrip('/')}"
elsif url.host.nil? || url.host.not_nil!.ends_with?("youtube.com") elsif url.host.nil? || url.host.not_nil!.ends_with?("youtube.com")
if url.path == "/redirect" if url.path == "/redirect"
# Sometimes, links can be corrupted (why?) so make sure to fallback # Sometimes, links can be corrupted (why?) so make sure to fallback
@ -587,7 +588,12 @@ def content_to_comment_html(content)
end end
end end
text = %(<a href="#{url}">#{reduce_uri(url)}</a>) if base_url.host.not_nil!.ends_with?("youtube.com") && base_url.path != "/redirect"
displayed_url = "youtube.com#{base_url.request_target}"
else
displayed_url = url
end
text = %(<a href="#{url}">#{reduce_uri(displayed_url)}</a>)
elsif watch_endpoint = run["navigationEndpoint"]["watchEndpoint"]? elsif watch_endpoint = run["navigationEndpoint"]["watchEndpoint"]?
length_seconds = watch_endpoint["startTimeSeconds"]? length_seconds = watch_endpoint["startTimeSeconds"]?
video_id = watch_endpoint["videoId"].as_s video_id = watch_endpoint["videoId"].as_s
@ -595,7 +601,7 @@ def content_to_comment_html(content)
if length_seconds && length_seconds.as_i > 0 if length_seconds && length_seconds.as_i > 0
text = %(<a href="javascript:void(0)" data-onclick="jump_to_time" data-jump-time="#{length_seconds}">#{text}</a>) text = %(<a href="javascript:void(0)" data-onclick="jump_to_time" data-jump-time="#{length_seconds}">#{text}</a>)
else else
text = %(<a href="/watch?v=#{video_id}">#{reduce_uri("/watch?v=#{video_id}")}</a>) text = %(<a href="/watch?v=#{video_id}">#{reduce_uri("youtube.com/watch?v=#{video_id}")}</a>)
end end
elsif url = run.dig?("navigationEndpoint", "commandMetadata", "webCommandMetadata", "url").try &.as_s elsif url = run.dig?("navigationEndpoint", "commandMetadata", "webCommandMetadata", "url").try &.as_s
text = %(<a href="#{url}">#{reduce_uri(url)}</a>) text = %(<a href="#{url}">#{reduce_uri(url)}</a>)