From 1cd3facc3de899ac864e979cd6d6a704b712cce3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Oct 2018 11:46:50 +0200 Subject: Add ability to list all local videos Including private/unlisted for moderators/admins --- shared/models/search/videos-search-query.model.ts | 3 +++ shared/models/users/user-right.enum.ts | 1 + shared/models/users/user-role.ts | 3 ++- shared/models/videos/video-query.type.ts | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) (limited to 'shared/models') diff --git a/shared/models/search/videos-search-query.model.ts b/shared/models/search/videos-search-query.model.ts index 29aa5c100..0db220758 100644 --- a/shared/models/search/videos-search-query.model.ts +++ b/shared/models/search/videos-search-query.model.ts @@ -1,4 +1,5 @@ import { NSFWQuery } from './nsfw-query.model' +import { VideoFilter } from '../videos' export interface VideosSearchQuery { search?: string @@ -23,4 +24,6 @@ export interface VideosSearchQuery { durationMin?: number // seconds durationMax?: number // seconds + + filter?: VideoFilter } diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts index c4ccd632f..ed2c536ce 100644 --- a/shared/models/users/user-right.enum.ts +++ b/shared/models/users/user-right.enum.ts @@ -14,5 +14,6 @@ export enum UserRight { REMOVE_ANY_VIDEO_CHANNEL, REMOVE_ANY_VIDEO_COMMENT, UPDATE_ANY_VIDEO, + SEE_ALL_VIDEOS, CHANGE_VIDEO_OWNERSHIP } diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts index 552aad999..d7020c0f2 100644 --- a/shared/models/users/user-role.ts +++ b/shared/models/users/user-role.ts @@ -26,7 +26,8 @@ const userRoleRights: { [ id: number ]: UserRight[] } = { UserRight.REMOVE_ANY_VIDEO, UserRight.REMOVE_ANY_VIDEO_CHANNEL, UserRight.REMOVE_ANY_VIDEO_COMMENT, - UserRight.UPDATE_ANY_VIDEO + UserRight.UPDATE_ANY_VIDEO, + UserRight.SEE_ALL_VIDEOS ], [UserRole.USER]: [] diff --git a/shared/models/videos/video-query.type.ts b/shared/models/videos/video-query.type.ts index ff0f527f3..f76a91aad 100644 --- a/shared/models/videos/video-query.type.ts +++ b/shared/models/videos/video-query.type.ts @@ -1 +1 @@ -export type VideoFilter = 'local' +export type VideoFilter = 'local' | 'all-local' -- cgit v1.2.3