Mirrored_Repos/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-11-10 02:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2195 from B0pol/trending

Browse Source 
Use youtubei API for trending
This commit is contained in:
Samantaz Fox 2021-06-25 17:53:07 +02:00 committed by GitHub
commit 135ae11c20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/invidious/helpers/youtube_api.cr
View File

@ -25,12 +25,14 @@ end
#################################################################### ####################################################################
# request_youtube_api_browse(continuation) # request_youtube_api_browse(continuation)
# request_youtube_api_browse(browse_id, params) # request_youtube_api_browse(browse_id, params, region)
# #
# Requests the youtubei/v1/browse endpoint with the required headers # Requests the youtubei/v1/browse endpoint with the required headers
# and POST data in order to get a JSON reply in english US that can # and POST data in order to get a JSON reply in english that can
# be easily parsed. # be easily parsed.
# #
# The region can be provided, default is US.
#
# The requested data can either be: # The requested data can either be:
# #
# - A continuation token (ctoken). Depending on this token's # - A continuation token (ctoken). Depending on this token's
@ -49,11 +51,11 @@ def request_youtube_api_browse(continuation : String)
return _youtube_api_post_json("/youtubei/v1/browse", data) return _youtube_api_post_json("/youtubei/v1/browse", data)
end end
def request_youtube_api_browse(browse_id : String, params : String) def request_youtube_api_browse(browse_id : String, params : String, region : String = "US")
# JSON Request data, required by the API # JSON Request data, required by the API
data = { data = {
"browseId" => browse_id, "browseId" => browse_id,
"context" => make_youtube_api_context("US"), "context" => make_youtube_api_context(region),
} }
# Append the additionnal parameters if those were provided # Append the additionnal parameters if those were provided

24
src/invidious/trending.cr
View File

@ -2,31 +2,19 @@ def fetch_trending(trending_type, region, locale)
region ||= "US" region ||= "US"
region = region.upcase region = region.upcase
trending = ""
plid = nil plid = nil
if trending_type && trending_type != "Default"
if trending_type == "Music" if trending_type == "Music"
trending_type = 1 params = "4gINGgt5dG1hX2NoYXJ0cw%3D%3D"
elsif trending_type == "Gaming" elsif trending_type == "Gaming"
trending_type = 2 params = "4gIcGhpnYW1pbmdfY29ycHVzX21vc3RfcG9wdWxhcg%3D%3D"
elsif trending_type == "Movies" elsif trending_type == "Movies"
trending_type = 3 params = "4gIKGgh0cmFpbGVycw%3D%3D"
else # Default
params = ""
end end
response = YT_POOL.client &.get("/feed/trending?gl=#{region}&hl=en").body initial_data = request_youtube_api_browse("FEtrending", params: params, region: region)
initial_data = extract_initial_data(response)
url = initial_data["contents"]["twoColumnBrowseResultsRenderer"]["tabs"][trending_type]["tabRenderer"]["endpoint"]["commandMetadata"]["webCommandMetadata"]["url"]
url = "#{url}&gl=#{region}&hl=en"
trending = YT_POOL.client &.get(url).body
plid = extract_plid(url)
else
trending = YT_POOL.client &.get("/feed/trending?gl=#{region}&hl=en").body
end
initial_data = extract_initial_data(trending)
trending = extract_videos(initial_data) trending = extract_videos(initial_data)
return {trending, plid} return {trending, plid}