summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaltycrys <73420320+saltycrys@users.noreply.github.com>2020-12-07 22:28:27 +0100
committersaltycrys <73420320+saltycrys@users.noreply.github.com>2020-12-07 22:28:27 +0100
commite55a09241e991ce2366608feb2e7c06bb67de8df (patch)
treed7c062dad708836842885dd5d5892458b0b87a8c
parent68552b6d6539792f59b901e222fc08999dcfc696 (diff)
downloadinvidious-e55a09241e991ce2366608feb2e7c06bb67de8df.tar.gz
invidious-e55a09241e991ce2366608feb2e7c06bb67de8df.tar.bz2
invidious-e55a09241e991ce2366608feb2e7c06bb67de8df.zip
Fix Invidious playlist continuation
Playing a video in a Invidious playlist now correctly redirects to the next video. The problem was that the offset was updated in the wrong place.
-rw-r--r--src/invidious/playlists.cr10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/invidious/playlists.cr b/src/invidious/playlists.cr
index 2389de49..d5b41caa 100644
--- a/src/invidious/playlists.cr
+++ b/src/invidious/playlists.cr
@@ -220,6 +220,11 @@ struct InvidiousPlaylist
json.field "videos" do
json.array do
+ if !offset || offset == 0
+ index = PG_DB.query_one?("SELECT index FROM playlist_videos WHERE plid = $1 AND id = $2 LIMIT 1", self.id, continuation, as: Int64)
+ offset = self.index.index(index) || 0
+ end
+
videos = get_playlist_videos(PG_DB, self, offset: offset, locale: locale, continuation: continuation)
videos.each_with_index do |video, index|
video.to_json(locale, json, offset + index)
@@ -412,11 +417,6 @@ end
def get_playlist_videos(db, playlist, offset, locale = nil, continuation = nil)
if playlist.is_a? InvidiousPlaylist
- if !offset
- index = PG_DB.query_one?("SELECT index FROM playlist_videos WHERE plid = $1 AND id = $2 LIMIT 1", playlist.id, continuation, as: Int64)
- offset = playlist.index.index(index) || 0
- end
-
db.query_all("SELECT * FROM playlist_videos WHERE plid = $1 ORDER BY array_position($2, index) LIMIT 100 OFFSET $3", playlist.id, playlist.index, offset, as: PlaylistVideo)
else
fetch_playlist_videos(playlist.id, playlist.video_count, offset, locale, continuation)