iv-org/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-12-21 13:35:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2936 from MathiusD/expand-link

Browse Source 
Increase size of links displayed in video description
This commit is contained in:
Samantaz Fox 2022-04-16 20:31:28 +02:00 committed by GitHub
commit 4130136718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/invidious/comments.cr
View File

@ -574,20 +574,24 @@ 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
url = URI.parse(url) url = URI.parse(url)
displayed_url = url
if url.host == "youtu.be" if url.host == "youtu.be"
url = "/watch?v=#{url.request_target.lstrip('/')}" url = "/watch?v=#{url.request_target.lstrip('/')}"
displayed_url = "youtube.com#{url}"
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
# nicely. See https://github.com/iv-org/invidious/issues/2682 # nicely. See https://github.com/iv-org/invidious/issues/2682
url = HTTP::Params.parse(url.query.not_nil!)["q"]? || "" url = HTTP::Params.parse(url.query.not_nil!)["q"]? || ""
displayed_url = url
else else
url = url.request_target url = url.request_target
displayed_url = "youtube.com#{url}"
end end
end end
text = %(<a href="#{url}">#{text}</a>) 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,10 +599,10 @@ 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}">#{text}</a>) text = %(<a href="/watch?v=#{video_id}">#{"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}">#{text}</a>) text = %(<a href="#{url}">#{reduce_uri(url)}</a>)
end end
end end

8
src/invidious/helpers/utils.cr
View File

@ -383,3 +383,11 @@ def fetch_random_instance
return filtered_instance_list.sample(1)[0] return filtered_instance_list.sample(1)[0]
end end
def reduce_uri(uri : URI | String, max_length : Int32 = 50, suffix : String = "…") : String
str = uri.to_s.sub(/^https?:\/\//, "")
if str.size > max_length
str = "#{str[0, max_length]}#{suffix}"
end
return str
end