Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix stateOneOf filter with search

Chocobozzzbc02c1043be6
diff --git a/server/core/models/video/sql/video/videos-id-list-query-builder.ts b/server/core/models/video/sql/video/videos-id-list-query-builder.ts
index 6907e4632e..04e08fa696 100644
--- a/server/core/models/video/sql/video/videos-id-list-query-builder.ts
+++ b/server/core/models/video/sql/video/videos-id-list-query-builder.ts
@@ -230,10 +230,12 @@ export class VideosIdListQueryBuilder extends AbstractRunQuery {
}
// Only list published videos
- if (!(options.include & VideoInclude.NOT_PUBLISHED_STATE)) {
+ if (!(options.include & VideoInclude.NOT_PUBLISHED_STATE) && !options.stateOneOf) {
if (options.includeScheduledLive) this.joinLiveSchedules()
this.whereStateAvailable({ includeScheduledLive: options.includeScheduledLive ?? false })
+ } else if (options.stateOneOf) {
+ this.whereStateOneOf(options.stateOneOf)
}
if (options.videoPlaylistId) {
@@ -290,10 +292,6 @@ export class VideosIdListQueryBuilder extends AbstractRunQuery {
this.whereAutoTagOneOf(options.autoTagOneOf)
}
- if (options.stateOneOf) {
- this.whereStateOneOf(options.stateOneOf)
- }
-
if (options.privacyOneOf) {
this.wherePrivacyOneOf(options.privacyOneOf)
} else {
diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.ts
index 3a14853339..129073ea88 100644
--- a/server/core/models/video/video.ts
+++ b/server/core/models/video/video.ts
@@ -1206,6 +1206,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {
tagsOneOf?: string[]
tagsAllOf?: string[]
privacyOneOf?: VideoPrivacyType[]
+ stateOneOf?: VideoStateType[]
includeScheduledLive?: boolean
displayOnlyForFollower: DisplayOnlyForFollowerOptions | null
@@ -1252,6 +1253,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {
'autoTagOneOf',
'tagsOneOf',
'tagsAllOf',
+ 'stateOneOf',
'privacyOneOf',
'user',
'isLocal',