midou/invidious
1
0
Fork 1
mirror of https://github.com/iv-org/invidious.git synced 2024-11-26 08:42:08 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1394 from Perflyst/fix-ci-test

Browse Source 
Fix CI tests
This commit is contained in:
TheFrenchGhosty 2020-10-04 08:08:55 +00:00 committed by GitHub
commit 94a330532d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/invidious/channels.cr
View File

@ -403,7 +403,7 @@ def produce_channel_videos_url(ucid, page = 1, auto_generated = nil, sort_by = "
object["80226972:embedded"]["3:base64"].as(Hash)["61:string"] = Base64.urlsafe_encode(Protodec::Any.from_json(Protodec::Any.cast_json({ object["80226972:embedded"]["3:base64"].as(Hash)["61:string"] = Base64.urlsafe_encode(Protodec::Any.from_json(Protodec::Any.cast_json({
"1:embedded" => { "1:embedded" => {
"1:varint" => 6307666885028338688_i64, "1:varint" => 6307666885028338688_i64,
"2:embedded" => { "2:embedded" => {
"1:string" => Base64.urlsafe_encode(Protodec::Any.from_json(Protodec::Any.cast_json({ "1:string" => Base64.urlsafe_encode(Protodec::Any.from_json(Protodec::Any.cast_json({
"1:varint" => 30_i64 * (page - 1), "1:varint" => 30_i64 * (page - 1),
@ -896,9 +896,9 @@ def get_channel_videos_response(ucid, page = 1, auto_generated = nil, sort_by =
return response if !initial_data return response if !initial_data
needs_v2 = initial_data needs_v2 = initial_data
.try &.["response"]?.try &.["alerts"]? .try &.["response"]?.try &.["alerts"]?
.try &.as_a.any? { |alert| .try &.as_a.any? { |alert|
alert.try &.["alertRenderer"]?.try &.["type"]?.try { |t| t == "ERROR" } alert.try &.["alertRenderer"]?.try &.["type"]?.try { |t| t == "ERROR" }
} }
if needs_v2 if needs_v2
url = produce_channel_videos_url(ucid, page, auto_generated: auto_generated, sort_by: sort_by, v2: true) url = produce_channel_videos_url(ucid, page, auto_generated: auto_generated, sort_by: sort_by, v2: true)
response = YT_POOL.client &.get(url) response = YT_POOL.client &.get(url)

16
src/invidious/helpers/helpers.cr
View File

@ -177,8 +177,8 @@ def extract_item(item : JSON::Any, author_fallback : String? = nil, author_id_fa
view_count = i["viewCountText"]?.try &.["simpleText"]?.try &.as_s.gsub(/\D+/, "").to_i64? || 0_i64 view_count = i["viewCountText"]?.try &.["simpleText"]?.try &.as_s.gsub(/\D+/, "").to_i64? || 0_i64
description_html = i["descriptionSnippet"]?.try { |t| parse_content(t) } || "" description_html = i["descriptionSnippet"]?.try { |t| parse_content(t) } || ""
length_seconds = i["lengthText"]?.try &.["simpleText"]?.try &.as_s.try { |t| decode_length_seconds(t) } || length_seconds = i["lengthText"]?.try &.["simpleText"]?.try &.as_s.try { |t| decode_length_seconds(t) } ||
i["thumbnailOverlays"]?.try &.as_a.find(&.["thumbnailOverlayTimeStatusRenderer"]?).try &.["thumbnailOverlayTimeStatusRenderer"]? i["thumbnailOverlays"]?.try &.as_a.find(&.["thumbnailOverlayTimeStatusRenderer"]?).try &.["thumbnailOverlayTimeStatusRenderer"]?
.try &.["text"]?.try &.["simpleText"]?.try &.as_s.try { |t| decode_length_seconds(t) } || 0 .try &.["text"]?.try &.["simpleText"]?.try &.as_s.try { |t| decode_length_seconds(t) } || 0
live_now = false live_now = false
paid = false paid = false
@ -302,14 +302,14 @@ def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : Stri
channel_v2_response = initial_data channel_v2_response = initial_data
.try &.["response"]? .try &.["response"]?
.try &.["continuationContents"]? .try &.["continuationContents"]?
.try &.["gridContinuation"]? .try &.["gridContinuation"]?
.try &.["items"]? .try &.["items"]?
if channel_v2_response if channel_v2_response
channel_v2_response.try &.as_a.each { |item| channel_v2_response.try &.as_a.each { |item|
extract_item(item, author_fallback, author_id_fallback) extract_item(item, author_fallback, author_id_fallback)
.try { |t| items << t } .try { |t| items << t }
} }
else else
initial_data.try { |t| t["contents"]? || t["response"]? } initial_data.try { |t| t["contents"]? || t["response"]? }
@ -325,7 +325,7 @@ def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : Stri
extract_item(item, author_fallback, author_id_fallback) extract_item(item, author_fallback, author_id_fallback)
.try { |t| items << t } .try { |t| items << t }
} } } }
end end
items items
end end