diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index ab9fcc8b..66cbc4fc 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -574,20 +574,24 @@ def content_to_comment_html(content)
if run["navigationEndpoint"]?
if url = run["navigationEndpoint"]["urlEndpoint"]?.try &.["url"].as_s
url = URI.parse(url)
+ displayed_url = url
if url.host == "youtu.be"
url = "/watch?v=#{url.request_target.lstrip('/')}"
+ displayed_url = "youtube.com#{url}"
elsif url.host.nil? || url.host.not_nil!.ends_with?("youtube.com")
if url.path == "/redirect"
# Sometimes, links can be corrupted (why?) so make sure to fallback
# nicely. See https://github.com/iv-org/invidious/issues/2682
url = HTTP::Params.parse(url.query.not_nil!)["q"]? || ""
+ displayed_url = url
else
url = url.request_target
+ displayed_url = "youtube.com#{url}"
end
end
- text = %(#{text})
+ text = %(#{reduce_uri(displayed_url)})
elsif watch_endpoint = run["navigationEndpoint"]["watchEndpoint"]?
length_seconds = watch_endpoint["startTimeSeconds"]?
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
text = %(#{text})
else
- text = %(#{text})
+ text = %(#{"youtube.com/watch?v=#{video_id}"})
end
elsif url = run.dig?("navigationEndpoint", "commandMetadata", "webCommandMetadata", "url").try &.as_s
- text = %(#{text})
+ text = %(#{reduce_uri(url)})
end
end
diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index c1dc17db..8ae5034a 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -383,3 +383,11 @@ def fetch_random_instance
return filtered_instance_list.sample(1)[0]
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