PrivateCoffee/invidious
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Simplify cvm assignment logic + improve formatting

Browse source 
Co-Authored-By: Samantaz Fox <coding@samantaz.fr>
This commit is contained in:
ChunkyProgrammer 2024-04-20 10:04:27 -04:00
parent fbf07e18aa
commit 2b6e71b553
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/invidious/comments/youtube.cr
View file

@ -133,15 +133,16 @@ module Invidious::Comments
node_replies = node["replies"]["commentRepliesRenderer"] node_replies = node["replies"]["commentRepliesRenderer"]
end end
if node["commentViewModel"]? if cvm = node["commentViewModel"]?
# two commentViewModels for inital request # two commentViewModels for inital request
cvm = node.dig?("commentViewModel", "commentViewModel")
# one commentViewModel when getting a replies to a comment # one commentViewModel when getting a replies to a comment
cvm ||= node.dig("commentViewModel") cvm = cvm["commentViewModel"] if cvm["commentViewModel"]?
comment_key = cvm["commentKey"] comment_key = cvm["commentKey"]
toolbar_key = cvm["toolbarStateKey"] toolbar_key = cvm["toolbarStateKey"]
comment_mutation = mutations.find { |i| i.dig?("payload", "commentEntityPayload", "key") == comment_key } comment_mutation = mutations.find { |i| i.dig?("payload", "commentEntityPayload", "key") == comment_key }
toolbar_mutation = mutations.find { |i| i.dig?("entityKey") == toolbar_key } toolbar_mutation = mutations.find { |i| i.dig?("entityKey") == toolbar_key }
if !comment_mutation.nil? && !toolbar_mutation.nil? if !comment_mutation.nil? && !toolbar_mutation.nil?
# todo parse styleRuns, commandRuns and attachmentRuns for comments # todo parse styleRuns, commandRuns and attachmentRuns for comments
html_content = parse_description(comment_mutation.dig("payload", "commentEntityPayload", "properties", "content"), id) html_content = parse_description(comment_mutation.dig("payload", "commentEntityPayload", "properties", "content"), id)
@ -160,17 +161,20 @@ module Invidious::Comments
end end
end end
end end
json.field "authorIsChannelOwner", comment_author["isCreator"].as_bool end
json.field "isSponsor", (comment_author["sponsorBadgeUrl"]? != nil)
if sponsor_badge_url = comment_author["sponsorBadgeUrl"]? json.field "authorIsChannelOwner", comment_author["isCreator"].as_bool
# Sponsor icon thumbnails always have one object and there's only ever the url property in it json.field "isSponsor", (comment_author["sponsorBadgeUrl"]? != nil)
json.field "sponsorIconUrl", sponsor_badge_url
end if sponsor_badge_url = comment_author["sponsorBadgeUrl"]?
# Sponsor icon thumbnails always have one object and there's only ever the url property in it
json.field "sponsorIconUrl", sponsor_badge_url
end end
comment_toolbar = comment_mutation.dig("payload", "commentEntityPayload", "toolbar") comment_toolbar = comment_mutation.dig("payload", "commentEntityPayload", "toolbar")
json.field "likeCount", short_text_to_number(comment_toolbar["likeCountNotliked"].as_s) json.field "likeCount", short_text_to_number(comment_toolbar["likeCountNotliked"].as_s)
reply_count = short_text_to_number(comment_toolbar["replyCount"]?.try &.as_s || "0") reply_count = short_text_to_number(comment_toolbar["replyCount"]?.try &.as_s || "0")
if heart_state = toolbar_mutation.dig?("payload", "engagementToolbarStateEntityPayload", "heartState") if heart_state = toolbar_mutation.dig?("payload", "engagementToolbarStateEntityPayload", "heartState")
if heart_state.as_s == "TOOLBAR_HEART_STATE_HEARTED" if heart_state.as_s == "TOOLBAR_HEART_STATE_HEARTED"
json.field "creatorHeart" do json.field "creatorHeart" do
@ -181,8 +185,10 @@ module Invidious::Comments
end end
end end
end end
published_text = comment_mutation.dig?("payload", "commentEntityPayload", "properties", "publishedTime").try &.as_s published_text = comment_mutation.dig?("payload", "commentEntityPayload", "properties", "publishedTime").try &.as_s
end end
json.field "isPinned", (cvm.dig?("pinnedText") != nil) json.field "isPinned", (cvm.dig?("pinnedText") != nil)
json.field "commentId", cvm["commentId"] json.field "commentId", cvm["commentId"]
else else