Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Videos: use WEB client instead of WEB CREATOR #4984

Merged
merged 4 commits into from
Nov 10, 2024
Merged

Videos: use WEB client instead of WEB CREATOR #4984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9ad9bd
use WEB when po_token + android test suite when no po_token
unixfox Nov 8, 2024
82b1506
remove usage of WebEmbeddedPlayer
unixfox Nov 8, 2024
f3e93ca
revert back to www.youtube.com when client_config.screen embed
unixfox Nov 8, 2024
0f8f32b
remove explicit usage of WEB
unixfox Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/invidious/videos/parser.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ end
def extract_video_info(video_id : String)
# Init client config for the API
client_config = YoutubeAPI::ClientConfig.new
# Use the WEB_CREATOR when po_token is configured because it fully only works on this client
if CONFIG.po_token
client_config.client_type = YoutubeAPI::ClientType::WebCreator
end

# Fetch data from the player endpoint
player_response = YoutubeAPI.player(video_id: video_id, params: "2AMB", client_config: client_config)
Expand Down Expand Up @@ -106,15 +102,8 @@ def extract_video_info(video_id : String)

new_player_response = nil

# Second try in case WEB_CREATOR doesn't work with po_token.
# Only trigger if reason found and po_token configured.
if reason && CONFIG.po_token
client_config.client_type = YoutubeAPI::ClientType::WebEmbeddedPlayer
new_player_response = try_fetch_streaming_data(video_id, client_config)
end

# Don't use Android client if po_token is passed because po_token doesn't
# work for Android client.
# Don't use Android test suite client if po_token is passed because po_token doesn't
# work for Android test suite client.
if reason.nil? && CONFIG.po_token.nil?
# Fetch the video streams using an Android client in order to get the
# decrypted URLs and maybe fix throttling issues (#2194). See the
Expand Down
3 changes: 1 addition & 2 deletions src/invidious/yt_backend/youtube_api.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,8 @@ module YoutubeAPI
end

if client_config.screen == "EMBED"
# embedUrl https://www.google.com allow loading almost all video that are configured not embeddable
client_context["thirdParty"] = {
"embedUrl" => "https://www.google.com/",
"embedUrl" => "https://www.youtube.com/embed/#{video_id}",
} of String => String | Int64
end

Expand Down
Loading