From 14592eef5863cda7285cc8efbd029fdab964a381 Mon Sep 17 00:00:00 2001 From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com> Date: Thu, 7 Mar 2024 21:41:22 -0500 Subject: [PATCH] add support for new hashtag header format --- src/invidious/yt_backend/extractors.cr | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr index a065632a..2b87c707 100644 --- a/src/invidious/yt_backend/extractors.cr +++ b/src/invidious/yt_backend/extractors.cr @@ -221,31 +221,28 @@ private module Parsers # A `hashtagHeaderRenderer` is displayed on the first page of the hashtag page. module HashtagRendererParser def self.process(item : JSON::Any, author_fallback : AuthorFallback) - if item_contents = (item["hashtagTileRenderer"]? || item["hashtagHeaderRenderer"]?) + if item_contents = (item["hashtagTileRenderer"]? || item["hashtagHeaderRenderer"]? || item["pageHeaderRenderer"]?) return self.parse(item_contents) end end private def self.parse(item_contents) - title = extract_text(item_contents["hashtag"]).not_nil! # E.g "#hi" + title = item_contents.dig?("pageTitle").try &.as_s + title ||= extract_text(item_contents["hashtag"]).not_nil! # E.g "#hi" # E.g "/hashtag/hi" url = item_contents.dig?("onTapCommand", "commandMetadata", "webCommandMetadata", "url").try &.as_s url ||= URI.encode_path("/hashtag/#{title.lchop('#')}") - if info = extract_text(item_contents.dig?("hashtagInfoText")) - regex_match = /(?\d+\S)\D+(?\d+\S)/.match(info) - videos = regex_match.try &.["videos"]?.try &.to_s - channels = regex_match.try &.["channels"]?.try &.to_s - else - video_count_txt = extract_text(item_contents["hashtagVideoCount"]?) # E.g "203K videos" - channel_count_txt = extract_text(item_contents["hashtagChannelCount"]?) # E.g "81K channels" - end + video_count_txt = extract_text(item_contents["hashtagVideoCount"]?) # E.g "203K videos" + channel_count_txt = extract_text(item_contents["hashtagChannelCount"]?) # E.g "81K channels" # Fallback for video/channel counts if channel_count_txt.nil? || video_count_txt.nil? + info_text = (item_contents.dig?("content", "pageHeaderViewModel", "metadata", "contentMetadataViewModel", "metadataRows", 0, "metadataParts", 0, "text", "content").try &.as_s || + extract_text(item_contents.dig?("hashtagInfoText"))).try &.split(" • ") + # E.g: "203K videos • 81K channels" - info_text = extract_text(item_contents["hashtagInfoText"]?).try &.split(" • ") if info_text && info_text.size == 2 video_count_txt ||= info_text[0]