Playlist reorder support

1 files changed, 6 insertions, 1 deletions

diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 06c63e87c..7624b0649 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -240,7 +240,10 @@ type AvailableForListIDsOptions = {
     if (options.videoPlaylistId) {
       query.include.push({
         model: VideoPlaylistElementModel.unscoped(),
-        required: true
+        required: true,
+        where: {
+          videoPlaylistId: options.videoPlaylistId
+        }
       })
     }
 
@@ -304,6 +307,8 @@ type AvailableForListIDsOptions = {
           videoPlaylistId: options.videoPlaylistId
         }
       })
+
+      query.subQuery = false
     }
 
     if (options.filter || options.accountId || options.videoChannelId) {