summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamantaz Fox <coding@samantaz.fr>2022-06-15 21:14:38 +0200
committerSamantaz Fox <coding@samantaz.fr>2022-07-04 22:23:31 +0200
commit99bc230fe64512b3f87095bb8111b24e15aa4285 (patch)
treed27d381d7a1f0745d6b499f16ede006640f4eee0 /src
parent0e3820b634cd94a647af099805d3957cd5c8998c (diff)
downloadinvidious-99bc230fe64512b3f87095bb8111b24e15aa4285.tar.gz
invidious-99bc230fe64512b3f87095bb8111b24e15aa4285.tar.bz2
invidious-99bc230fe64512b3f87095bb8111b24e15aa4285.zip
Fix missing hash key: "availableCountries" (Closes #3047)
Diffstat (limited to 'src')
-rw-r--r--src/invidious/channels/about.cr13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/invidious/channels/about.cr b/src/invidious/channels/about.cr
index 565f2bca..1d7947a6 100644
--- a/src/invidious/channels/about.cr
+++ b/src/invidious/channels/about.cr
@@ -54,9 +54,6 @@ def get_about_info(ucid, locale) : AboutChannel
banner = banners.try &.[-1]?.try &.["url"].as_s?
description_node = initdata["header"]["interactiveTabbedHeaderRenderer"]["description"]
-
- is_family_friendly = initdata["microformat"]["microformatDataRenderer"]["familySafe"].as_bool
- allowed_regions = initdata["microformat"]["microformatDataRenderer"]["availableCountries"].as_a.map(&.as_s)
else
author = initdata["metadata"]["channelMetadataRenderer"]["title"].as_s
author_url = initdata["metadata"]["channelMetadataRenderer"]["channelUrl"].as_s
@@ -74,13 +71,17 @@ def get_about_info(ucid, locale) : AboutChannel
# end
description_node = initdata["metadata"]["channelMetadataRenderer"]?.try &.["description"]?
-
- is_family_friendly = initdata["microformat"]["microformatDataRenderer"]["familySafe"].as_bool
- allowed_regions = initdata["microformat"]["microformatDataRenderer"]["availableCountries"].as_a.map(&.as_s)
end
+ is_family_friendly = initdata["microformat"]["microformatDataRenderer"]["familySafe"].as_bool
+
+ allowed_regions = initdata
+ .dig?("microformat", "microformatDataRenderer", "availableCountries")
+ .try &.as_a.map(&.as_s) || [] of String
+
description = !description_node.nil? ? description_node.as_s : ""
description_html = HTML.escape(description)
+
if !description_node.nil?
if description_node.as_h?.nil?
description_node = text_to_parsed_content(description_node.as_s)