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

Merge 7ea63a320ff1fb8256df3b2479b123ef72fa7f8a into d10f2a48021f1768f2d6ff3bd1b9f3de4e0b2d22

Browse Source
This commit is contained in:
PoleTransformer 2026-08-15 03:36:25 +00:00 committed by GitHub
commit 89891dc004
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,12 @@ def parse_description(desc, video_id : String) : String?
content = desc["content"].as_s content = desc["content"].as_s
return "" if content.empty? return "" if content.empty?
commands = desc["commandRuns"]?.try &.as_a # attachmentRuns contains custom emoji URLs
if commands.nil? attachments = desc["attachmentRuns"]?.try &.as_a || [] of JSON::Any
commands = desc["commandRuns"]?.try &.as_a || [] of JSON::Any
if commands.empty? && attachments.empty?
# Slightly faster than HTML.escape, as we're only doing one pass on # Slightly faster than HTML.escape, as we're only doing one pass on
# the string instead of five for the standard library # the string instead of five for the standard library
return String.build do |str| return String.build do |str|
@ -65,9 +69,12 @@ def parse_description(desc, video_id : String) : String?
index = 0 index = 0
return String.build do |str| return String.build do |str|
commands.each do |command| # Combine commandRuns and attachmentRuns into one array
cmd_start = command["startIndex"].as_i events = commands + attachments
cmd_length = command["length"].as_i
events.each do |event|
cmd_start = event["startIndex"].as_i
cmd_length = event["length"].as_i
# Copy the text chunk between this command and the previous if needed. # Copy the text chunk between this command and the previous if needed.
length = cmd_start - index length = cmd_start - index
@ -79,14 +86,38 @@ def parse_description(desc, video_id : String) : String?
copy_string(str2, iter, cmd_length) copy_string(str2, iter, cmd_length)
end end
# Check if event is an attachment AND a custom emoji using regex. Format is :<name>:
# Members-only custom emojis have prefix :_ Built in YouTube emojis do not
if (image = event.dig?("element", "type", "imageType", "image")) && cmd_content.matches?(/^:[^:\s]+:$/)
# Source contains the emoji URL, height, and width
source = image["sources"][0]
# Extract the emoji name
label = event.dig?("element", "properties", "accessibilityProperties", "label").try &.as_s || ""
# Apply channel-emoji CSS to add margin around emoji
str << %(<img class="channel-emoji" alt=")
str << HTML.escape(label)
str << %(" src="/ggpht)
str << URI.parse(url = source["url"].as_s).request_target
str << %(" title=")
str << HTML.escape(label)
str << %(" width=")
str << source["width"]?.to_s
str << %(" height=")
str << source["height"]?.to_s
str << %(" />)
index += cmd_length
else
link = cmd_content link = cmd_content
if on_tap = command.dig?("onTap", "innertubeCommand") if on_tap = event.dig?("onTap", "innertubeCommand")
link = parse_link_endpoint(on_tap, cmd_content, video_id) link = parse_link_endpoint(on_tap, cmd_content, video_id)
end end
str << link str << link
index += cmd_length index += cmd_length
end end
end
# Copy the end of the string (past the last command). # Copy the end of the string (past the last command).
content_size = content.ascii_only? ? content.size : utf16_length(content) content_size = content.ascii_only? ? content.size : utf16_length(content)
remaining_length = content_size - index remaining_length = content_size - index