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

Merge pull request #1506 from tirz/fix-channel_parsing

Browse source 
fix: channel info parsing
This commit is contained in:
TheFrenchGhosty 2020-11-30 19:16:31 +00:00 committed by GitHub
commit 4acfd2c342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/invidious/channels.cr
View file

@ -801,11 +801,11 @@ def get_about_info(ucid, locale)
raise InfoException.new(error_message) raise InfoException.new(error_message)
end end
author = about.xpath_node(%q(//meta[@name="title"])).not_nil!["content"] author = initdata["metadata"]["channelMetadataRenderer"]["title"].as_s
author_url = about.xpath_node(%q(//link[@rel="canonical"])).not_nil!["href"] author_url = initdata["metadata"]["channelMetadataRenderer"]["channelUrl"].as_s
author_thumbnail = about.xpath_node(%q(//link[@rel="image_src"])).not_nil!["href"] author_thumbnail = initdata["metadata"]["channelMetadataRenderer"]["avatar"]["thumbnails"][0]["url"].as_s
ucid = about.xpath_node(%q(//meta[@itemprop="channelId"])).not_nil!["content"] ucid = initdata["metadata"]["channelMetadataRenderer"]["externalId"].as_s
# Raises a KeyError on failure. # Raises a KeyError on failure.
banners = initdata["header"]["c4TabbedHeaderRenderer"]?.try &.["banner"]?.try &.["thumbnails"]? banners = initdata["header"]["c4TabbedHeaderRenderer"]?.try &.["banner"]?.try &.["thumbnails"]?

2
src/invidious/helpers/helpers.cr
View file

@ -598,7 +598,7 @@ def create_notification_stream(env, topics, connection_channel)
end end
def extract_initial_data(body) : Hash(String, JSON::Any) def extract_initial_data(body) : Hash(String, JSON::Any)
return JSON.parse(body.match(/(window\["ytInitialData"\]|var\s*ytInitialData)\s*=\s*(JSON\.parse\(")?(?<info>\{.*?\})("\))?;/m).try &.["info"] || "{}").as_h return JSON.parse(body.match(/(window\["ytInitialData"\]|var\s*ytInitialData)\s*=\s*(?<info>\{.*?\});/mx).try &.["info"] || "{}").as_h
end end
def proxy_file(response, env) def proxy_file(response, env)