Merge pull request #454 from TeamPiped/playlist-fix

Fix for playlist video ordering.
This commit is contained in:
Kavin 2022-11-19 00:18:07 +00:00 committed by GitHub
commit 8395343ec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -130,7 +130,7 @@ public class DatabaseHelper {
} }
public static List<PlaylistVideo> getPlaylistVideosFromPlaylistId(SharedSessionContract s, String id, boolean fetchChannel) { public static List<PlaylistVideo> getPlaylistVideosFromPlaylistId(SharedSessionContract s, String id, boolean fetchChannel) {
var query = s.createNativeQuery("SELECT {playlist_videos.*}, {channels.*} FROM playlist_videos JOIN channels ON playlist_videos.uploader_id = channels.uploader_id JOIN playlists_videos_ids ON playlist_videos.id = playlists_videos_ids.videos_id JOIN playlists ON playlists.id = playlists_videos_ids.playlist_id WHERE playlists.playlist_id = :id") var query = s.createNativeQuery("SELECT {playlist_videos.*}, {channels.*} FROM playlist_videos JOIN channels ON playlist_videos.uploader_id = channels.uploader_id JOIN playlists_videos_ids ON playlist_videos.id = playlists_videos_ids.videos_id JOIN playlists ON playlists.id = playlists_videos_ids.playlist_id WHERE playlists.playlist_id = :id ORDER BY playlists_videos_ids.videos_order ASC")
.addEntity("playlist_videos", PlaylistVideo.class) .addEntity("playlist_videos", PlaylistVideo.class)
.addEntity("channels", Channel.class) .addEntity("channels", Channel.class)
.setParameter("id", UUID.fromString(id)); .setParameter("id", UUID.fromString(id));