From 527a52ac4295a072927ff46761766a8b181a7603 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 12 Nov 2021 14:19:56 +0100 Subject: Add ability to filter out public videos from admin --- shared/core-utils/videos/index.ts | 1 + shared/core-utils/videos/privacy.ts | 9 +++++++++ shared/models/search/videos-common-query.model.ts | 3 +++ shared/models/videos/video-include.enum.ts | 7 +++---- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 shared/core-utils/videos/privacy.ts (limited to 'shared') diff --git a/shared/core-utils/videos/index.ts b/shared/core-utils/videos/index.ts index 5a1145f1a..620e3a716 100644 --- a/shared/core-utils/videos/index.ts +++ b/shared/core-utils/videos/index.ts @@ -1 +1,2 @@ export * from './bitrate' +export * from './privacy' diff --git a/shared/core-utils/videos/privacy.ts b/shared/core-utils/videos/privacy.ts new file mode 100644 index 000000000..7d3b67d50 --- /dev/null +++ b/shared/core-utils/videos/privacy.ts @@ -0,0 +1,9 @@ +import { VideoPrivacy } from '../../models/videos/video-privacy.enum' + +function getAllPrivacies () { + return [ VideoPrivacy.PUBLIC, VideoPrivacy.INTERNAL, VideoPrivacy.PRIVATE, VideoPrivacy.UNLISTED ] +} + +export { + getAllPrivacies +} diff --git a/shared/models/search/videos-common-query.model.ts b/shared/models/search/videos-common-query.model.ts index e9edb91b0..2cbf7b014 100644 --- a/shared/models/search/videos-common-query.model.ts +++ b/shared/models/search/videos-common-query.model.ts @@ -1,3 +1,4 @@ +import { VideoPrivacy } from '@shared/models' import { VideoInclude } from '../videos/video-include.enum' import { BooleanBothQuery } from './boolean-both-query.model' @@ -23,6 +24,8 @@ export interface VideosCommonQuery { languageOneOf?: string[] + privacyOneOf?: VideoPrivacy[] + tagsOneOf?: string[] tagsAllOf?: string[] diff --git a/shared/models/videos/video-include.enum.ts b/shared/models/videos/video-include.enum.ts index 72fa8cd30..7e16b129a 100644 --- a/shared/models/videos/video-include.enum.ts +++ b/shared/models/videos/video-include.enum.ts @@ -1,8 +1,7 @@ export const enum VideoInclude { NONE = 0, NOT_PUBLISHED_STATE = 1 << 0, - HIDDEN_PRIVACY = 1 << 1, - BLACKLISTED = 1 << 2, - BLOCKED_OWNER = 1 << 3, - FILES = 1 << 4 + BLACKLISTED = 1 << 1, + BLOCKED_OWNER = 1 << 2, + FILES = 1 << 3 } -- cgit v1.2.3