Merge pull request #1506 from tirz/fix-channel_parsing

fix: channel info parsing

2 files changed, 5 insertions, 5 deletions

diff --git a/src/invidious/channels.cr b/src/invidious/channels.cr
index 82921ac7..93507c56 100644
--- a/src/invidious/channels.cr
+++ b/src/invidious/channels.cr
@@ -801,11 +801,11 @@ def get_about_info(ucid, locale)
     raise InfoException.new(error_message)
   end
 
-  author = about.xpath_node(%q(//meta[@name="title"])).not_nil!["content"]
-  author_url = about.xpath_node(%q(//link[@rel="canonical"])).not_nil!["href"]
-  author_thumbnail = about.xpath_node(%q(//link[@rel="image_src"])).not_nil!["href"]
+  author = initdata["metadata"]["channelMetadataRenderer"]["title"].as_s
+  author_url = initdata["metadata"]["channelMetadataRenderer"]["channelUrl"].as_s
+  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.
   banners = initdata["header"]["c4TabbedHeaderRenderer"]?.try &.["banner"]?.try &.["thumbnails"]?
diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr
index 7a0cb3d3..dc68fb5c 100644
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -598,7 +598,7 @@ def create_notification_stream(env, topics, connection_channel)
 end
 
 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
 
 def proxy_file(response, env)