VeritableValor/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2026-08-17 05:20:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(comments): add defensive guards for emoji thumbnails and correct attribute escaping

Browse Source
This commit is contained in:
Test User 2026-08-08 15:51:21 -04:00
parent 2ea9a8e6d9
commit 61a1c84f4b
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/invidious/comments/content.cr
View File

@ -64,19 +64,27 @@ def content_to_comment_html(content, video_id : String? = "")
# check for custom emojis # check for custom emojis
if run["emoji"]? if run["emoji"]?
if emoji_image = run.dig?("emoji", "image") if emoji_image = run.dig?("emoji", "image")
emoji_alt = HTML.escape(emoji_image.dig?("accessibility", "accessibilityData", "label").try(&.as_s) || text) thumbnails = emoji_image["thumbnails"]?.try &.as_a?
emoji_thumb = emoji_image["thumbnails"][0] if thumbnails && (emoji_thumb = thumbnails.first?) && (thumb_url = emoji_thumb["url"]?.try &.as_s?)
text = String.build do |str| raw_label = emoji_image.dig?("accessibility", "accessibilityData", "label").try &.as_s?
str << %(<img alt=") << emoji_alt << "\" " emoji_alt = raw_label ? HTML.escape(raw_label) : text
str << %(src="/ggpht) << URI.parse(emoji_thumb["url"].as_s).request_target << "\" "
str << %(title=") << emoji_alt << "\" " text = String.build do |str|
str << %(width=") << emoji_thumb["width"] << "\" " str << %(<img alt=") << emoji_alt << "\" "
str << %(height=") << emoji_thumb["height"] << "\" " str << %(src="/ggpht) << URI.parse(thumb_url).request_target << "\" "
str << %(class="channel-emoji" />) str << %(title=") << emoji_alt << "\" "
if thumb_width = emoji_thumb["width"]?
str << %(width=") << thumb_width << "\" "
end
if thumb_height = emoji_thumb["height"]?
str << %(height=") << thumb_height << "\" "
end
str << %(class="channel-emoji" />)
end
end end
else else
# Hide deleted channel emoji # Hide deleted channel emoji
text = "" text = "" if text.starts_with?(':') && text.ends_with?(':')
end end
end end

28
src/invidious/videos/description.cr
View File

@ -80,8 +80,34 @@ def parse_description(desc, video_id : String) : String?
end end
link = cmd_content link = cmd_content
if command["emoji"]?
if emoji_image = command.dig?("emoji", "image")
thumbnails = emoji_image["thumbnails"]?.try &.as_a?
if thumbnails && (emoji_thumb = thumbnails.first?) && (thumb_url = emoji_thumb["url"]?.try &.as_s?)
raw_label = emoji_image.dig?("accessibility", "accessibilityData", "label").try &.as_s?
emoji_alt = raw_label ? HTML.escape(raw_label) : cmd_content
link = String.build do |s|
s << %(<img alt=") << emoji_alt << "\" "
s << %(src="/ggpht) << URI.parse(thumb_url).request_target << "\" "
s << %(title=") << emoji_alt << "\" "
if thumb_width = emoji_thumb["width"]?
s << %(width=") << thumb_width << "\" "
end
if thumb_height = emoji_thumb["height"]?
s << %(height=") << thumb_height << "\" "
end
s << %(class="channel-emoji" />)
end
end
else
link = "" if link.starts_with?(':') && link.ends_with?(':')
end
end
if on_tap = command.dig?("onTap", "innertubeCommand") if on_tap = command.dig?("onTap", "innertubeCommand")
link = parse_link_endpoint(on_tap, cmd_content, video_id) link = parse_link_endpoint(on_tap, link, video_id)
end end
str << link str << link
index += cmd_length index += cmd_length