Revert "Merge branch 'playlist-link-listen-mode'"
All checks were successful
Invidious CI / build (push) Successful in 6m42s
All checks were successful
Invidious CI / build (push) Successful in 6m42s
This reverts commit8c0f03e83c
, reversing changes made toa2d82ff829
. This breaks videoplayback
This commit is contained in:
parent
8c0f03e83c
commit
6db157fd5e
4 changed files with 6 additions and 16 deletions
|
@ -67,10 +67,6 @@ function get_playlist(plid) {
|
|||
'&format=html&hl=' + video_data.preferences.locale;
|
||||
}
|
||||
|
||||
if (video_data.params.listen) {
|
||||
plid_url += '&listen=1'
|
||||
}
|
||||
|
||||
helpers.xhr('GET', plid_url, {retries: 5, entity_name: 'playlist'}, {
|
||||
on200: function (response) {
|
||||
playlist.innerHTML = response.playlistHtml;
|
||||
|
|
|
@ -81,7 +81,7 @@ def fetch_mix(rdid, video_id, cookies = nil, locale = nil)
|
|||
})
|
||||
end
|
||||
|
||||
def template_mix(mix, listen)
|
||||
def template_mix(mix)
|
||||
html = <<-END_HTML
|
||||
<h3>
|
||||
<a href="/mix?list=#{mix["mixId"]}">
|
||||
|
@ -95,7 +95,7 @@ def template_mix(mix, listen)
|
|||
mix["videos"].as_a.each do |video|
|
||||
html += <<-END_HTML
|
||||
<li class="pure-menu-item">
|
||||
<a href="/watch?v=#{video["videoId"]}&list=#{mix["mixId"]}#{listen ? "&listen=1" : ""}">
|
||||
<a href="/watch?v=#{video["videoId"]}&list=#{mix["mixId"]}">
|
||||
<div class="thumbnail">
|
||||
<img loading="lazy" class="thumbnail" src="/vi/#{video["videoId"]}/mqdefault.jpg" alt="" />
|
||||
<p class="length">#{recode_length_seconds(video["lengthSeconds"].as_i)}</p>
|
||||
|
|
|
@ -505,7 +505,7 @@ def extract_playlist_videos(initial_data : Hash(String, JSON::Any))
|
|||
return videos
|
||||
end
|
||||
|
||||
def template_playlist(playlist, listen)
|
||||
def template_playlist(playlist)
|
||||
html = <<-END_HTML
|
||||
<h3>
|
||||
<a href="/playlist?list=#{playlist["playlistId"]}">
|
||||
|
@ -519,7 +519,7 @@ def template_playlist(playlist, listen)
|
|||
playlist["videos"].as_a.each do |video|
|
||||
html += <<-END_HTML
|
||||
<li class="pure-menu-item" id="#{video["videoId"]}">
|
||||
<a href="/watch?v=#{video["videoId"]}&list=#{playlist["playlistId"]}&index=#{video["index"]}#{listen ? "&listen=1" : ""}">
|
||||
<a href="/watch?v=#{video["videoId"]}&list=#{playlist["playlistId"]}&index=#{video["index"]}">
|
||||
<div class="thumbnail">
|
||||
<img loading="lazy" class="thumbnail" src="/vi/#{video["videoId"]}/mqdefault.jpg" alt="" />
|
||||
<p class="length">#{recode_length_seconds(video["lengthSeconds"].as_i)}</p>
|
||||
|
|
|
@ -42,9 +42,6 @@ module Invidious::Routes::API::V1::Misc
|
|||
format = env.params.query["format"]?
|
||||
format ||= "json"
|
||||
|
||||
listenParam = env.params.query["listen"]?
|
||||
listen = (listenParam == "true" || listenParam == "1")
|
||||
|
||||
if plid.starts_with? "RD"
|
||||
return env.redirect "/api/v1/mixes/#{plid}"
|
||||
end
|
||||
|
@ -88,7 +85,7 @@ module Invidious::Routes::API::V1::Misc
|
|||
end
|
||||
|
||||
if format == "html"
|
||||
playlist_html = template_playlist(json_response, listen)
|
||||
playlist_html = template_playlist(json_response)
|
||||
index, next_video = json_response["videos"].as_a.skip(1 + lookback).select { |video| !video["author"].as_s.empty? }[0]?.try { |v| {v["index"], v["videoId"]} } || {nil, nil}
|
||||
|
||||
response = {
|
||||
|
@ -114,9 +111,6 @@ module Invidious::Routes::API::V1::Misc
|
|||
format = env.params.query["format"]?
|
||||
format ||= "json"
|
||||
|
||||
listenParam = env.params.query["listen"]?
|
||||
listen = (listenParam == "true" || listenParam == "1")
|
||||
|
||||
begin
|
||||
mix = fetch_mix(rdid, continuation, locale: locale)
|
||||
|
||||
|
@ -163,7 +157,7 @@ module Invidious::Routes::API::V1::Misc
|
|||
|
||||
if format == "html"
|
||||
response = JSON.parse(response)
|
||||
playlist_html = template_mix(response, listen)
|
||||
playlist_html = template_mix(response)
|
||||
next_video = response["videos"].as_a.select { |video| !video["author"].as_s.empty? }[0]?.try &.["videoId"]
|
||||
|
||||
response = {
|
||||
|
|
Loading…
Reference in a new issue