Archives/invidious
2
0
Fork 0
mirror of https://github.com/iv-org/invidious synced 2024-11-09 01:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix channel search API

Browse Source
This commit is contained in:
Svallinn 2021-03-24 05:15:06 +00:00
parent c481ca924b
commit e49aaa0216
No known key found for this signature in database
GPG Key ID: 09FB527F34037CCA
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/invidious/search.cr
View File

@ -231,20 +231,27 @@ end
alias SearchItem = SearchVideo | SearchChannel | SearchPlaylist alias SearchItem = SearchVideo | SearchChannel | SearchPlaylist
def channel_search(query, page, channel) def channel_search(query, page, channel)
response = YT_POOL.client &.get("/channel/#{channel}?hl=en&gl=US") response = YT_POOL.client &.get("/channel/#{channel}")
response = YT_POOL.client &.get("/user/#{channel}?hl=en&gl=US") if response.headers["location"]?
response = YT_POOL.client &.get("/c/#{channel}?hl=en&gl=US") if response.headers["location"]?
ucid = response.body.match(/\\"channelId\\":\\"(?<ucid>[^\\]+)\\"/).try &.["ucid"]? if response.status_code == 404
response = YT_POOL.client &.get("/user/#{channel}")
response = YT_POOL.client &.get("/c/#{channel}") if response.status_code == 404
ucid = response.body.match(/HeaderRenderer":\{"channelId":"(?<ucid>[^\\"]+)"/).try &.["ucid"]?
else
ucid = channel
end
return 0, [] of SearchItem if !ucid continuation = produce_channel_search_continuation(ucid, query, page)
response_json = request_youtube_api_browse(continuation)
url = produce_channel_search_url(ucid, query, page) result = JSON.parse(response_json.match(/"continuationItems": (?<items>\[.*\]),/m).try &.["items"] || "{}")
response = YT_POOL.client &.get(url) return 0, [] of SearchItem if result.size == 0
initial_data = JSON.parse(response.body).as_a.find &.["response"]?
return 0, [] of SearchItem if !initial_data items = [] of SearchItem
author = initial_data["response"]?.try &.["metadata"]?.try &.["channelMetadataRenderer"]?.try &.["title"]?.try &.as_s result.as_a.select(&.as_h.has_key?("itemSectionRenderer")).each { |item|
items = extract_items(initial_data.as_h, author, ucid) extract_item(item["itemSectionRenderer"]["contents"].as_a[0])
.try { |t| items << t }
}
return items.size, items return items.size, items
end end
@ -361,17 +368,28 @@ def produce_search_params(page = 1, sort : String = "relevance", date : String =
return params return params
end end
def produce_channel_search_url(ucid, query, page) def produce_channel_search_continuation(ucid, query, page)
if page <= 1
idx = 0_i64
else
idx = 30_i64 * (page - 1)
end
object = { object = {
"80226972:embedded" => { "80226972:embedded" => {
"2:string" => ucid, "2:string" => ucid,
"3:base64" => { "3:base64" => {
"2:string" => "search", "2:string" => "search",
"6:varint" => 1_i64,
"7:varint" => 1_i64, "7:varint" => 1_i64,
"15:string" => "#{page}", "12:varint" => 1_i64,
"15:base64" => {
"3:varint" => idx,
},
"23:varint" => 0_i64, "23:varint" => 0_i64,
}, },
"11:string" => query, "11:string" => query,
"35:string" => "browse-feed#{ucid}search",
}, },
} }
@ -380,7 +398,7 @@ def produce_channel_search_url(ucid, query, page)
.try { |i| Base64.urlsafe_encode(i) } .try { |i| Base64.urlsafe_encode(i) }
.try { |i| URI.encode_www_form(i) } .try { |i| URI.encode_www_form(i) }
return "/browse_ajax?continuation=#{continuation}&gl=US&hl=en" return continuation
end end
def process_search_query(query, page, user, region) def process_search_query(query, page, user, region)