From 59c76ffa8f503e962d517c78f033f1beccb1de1a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 14 Aug 2018 14:59:53 +0200 Subject: Flat shared module directory --- client/src/standalone/videos/embed.ts | 2 +- server/initializers/constants.ts | 3 +- server/models/video/video-caption.ts | 2 +- server/tests/api/server/follows.ts | 2 +- server/tests/api/videos/video-captions.ts | 2 +- server/tests/utils/videos/video-abuses.ts | 2 +- shared/models/users/user.model.ts | 2 +- .../videos/abuse/video-abuse-create.model.ts | 3 ++ .../models/videos/abuse/video-abuse-state.model.ts | 5 ++++ .../videos/abuse/video-abuse-update.model.ts | 6 ++++ shared/models/videos/abuse/video-abuse.model.ts | 20 +++++++++++++ .../blacklist/video-blacklist-create.model.ts | 3 ++ .../blacklist/video-blacklist-update.model.ts | 3 ++ .../videos/blacklist/video-blacklist.model.ts | 18 ++++++++++++ .../videos/caption/video-caption-update.model.ts | 4 +++ .../models/videos/caption/video-caption.model.ts | 6 ++++ .../videos/channel/video-channel-create.model.ts | 5 ++++ .../videos/channel/video-channel-update.model.ts | 5 ++++ .../models/videos/channel/video-channel.model.ts | 11 +++++++ .../videos/import/video-import-create.model.ts | 9 ++++++ .../videos/import/video-import-state.enum.ts | 5 ++++ shared/models/videos/import/video-import.model.ts | 18 ++++++++++++ shared/models/videos/index.ts | 34 +++++++++++----------- .../videos/rate/user-video-rate-update.model.ts | 5 ++++ shared/models/videos/rate/user-video-rate.model.ts | 6 ++++ shared/models/videos/rate/user-video-rate.type.ts | 1 + .../models/videos/user-video-rate-update.model.ts | 5 ---- shared/models/videos/user-video-rate.model.ts | 6 ---- shared/models/videos/user-video-rate.type.ts | 1 - shared/models/videos/video-abuse-create.model.ts | 3 -- shared/models/videos/video-abuse-state.model.ts | 5 ---- shared/models/videos/video-abuse-update.model.ts | 6 ---- shared/models/videos/video-abuse.model.ts | 20 ------------- .../models/videos/video-blacklist-create.model.ts | 3 -- .../models/videos/video-blacklist-update.model.ts | 3 -- shared/models/videos/video-blacklist.model.ts | 18 ------------ shared/models/videos/video-caption-update.model.ts | 4 --- shared/models/videos/video-caption.model.ts | 6 ---- shared/models/videos/video-channel-create.model.ts | 5 ---- shared/models/videos/video-channel-update.model.ts | 5 ---- shared/models/videos/video-channel.model.ts | 11 ------- shared/models/videos/video-import-create.model.ts | 9 ------ shared/models/videos/video-import-state.enum.ts | 5 ---- shared/models/videos/video-import.model.ts | 18 ------------ shared/models/videos/video.model.ts | 2 +- 45 files changed, 158 insertions(+), 159 deletions(-) create mode 100644 shared/models/videos/abuse/video-abuse-create.model.ts create mode 100644 shared/models/videos/abuse/video-abuse-state.model.ts create mode 100644 shared/models/videos/abuse/video-abuse-update.model.ts create mode 100644 shared/models/videos/abuse/video-abuse.model.ts create mode 100644 shared/models/videos/blacklist/video-blacklist-create.model.ts create mode 100644 shared/models/videos/blacklist/video-blacklist-update.model.ts create mode 100644 shared/models/videos/blacklist/video-blacklist.model.ts create mode 100644 shared/models/videos/caption/video-caption-update.model.ts create mode 100644 shared/models/videos/caption/video-caption.model.ts create mode 100644 shared/models/videos/channel/video-channel-create.model.ts create mode 100644 shared/models/videos/channel/video-channel-update.model.ts create mode 100644 shared/models/videos/channel/video-channel.model.ts create mode 100644 shared/models/videos/import/video-import-create.model.ts create mode 100644 shared/models/videos/import/video-import-state.enum.ts create mode 100644 shared/models/videos/import/video-import.model.ts create mode 100644 shared/models/videos/rate/user-video-rate-update.model.ts create mode 100644 shared/models/videos/rate/user-video-rate.model.ts create mode 100644 shared/models/videos/rate/user-video-rate.type.ts delete mode 100644 shared/models/videos/user-video-rate-update.model.ts delete mode 100644 shared/models/videos/user-video-rate.model.ts delete mode 100644 shared/models/videos/user-video-rate.type.ts delete mode 100644 shared/models/videos/video-abuse-create.model.ts delete mode 100644 shared/models/videos/video-abuse-state.model.ts delete mode 100644 shared/models/videos/video-abuse-update.model.ts delete mode 100644 shared/models/videos/video-abuse.model.ts delete mode 100644 shared/models/videos/video-blacklist-create.model.ts delete mode 100644 shared/models/videos/video-blacklist-update.model.ts delete mode 100644 shared/models/videos/video-blacklist.model.ts delete mode 100644 shared/models/videos/video-caption-update.model.ts delete mode 100644 shared/models/videos/video-caption.model.ts delete mode 100644 shared/models/videos/video-channel-create.model.ts delete mode 100644 shared/models/videos/video-channel-update.model.ts delete mode 100644 shared/models/videos/video-channel.model.ts delete mode 100644 shared/models/videos/video-import-create.model.ts delete mode 100644 shared/models/videos/video-import-state.enum.ts delete mode 100644 shared/models/videos/video-import.model.ts diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 98ce73257..2aabb5fe8 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts @@ -24,7 +24,7 @@ import { ResultList, VideoDetails } from '../../../../shared' import { addContextMenu, getVideojsOptions, loadLocale } from '../../assets/player/peertube-player' import { PeerTubeResolution } from '../player/definitions' import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings' -import { VideoCaption } from '../../../../shared/models/videos/video-caption.model' +import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' /** * Embed API exposes control of the embed player to the outside world via diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index ff8e64330..bce797159 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -3,12 +3,11 @@ import { dirname, join } from 'path' import { JobType, VideoRateType, VideoState } from '../../shared/models' import { ActivityPubActorType } from '../../shared/models/activitypub' import { FollowState } from '../../shared/models/actors' -import { VideoPrivacy, VideoAbuseState } from '../../shared/models/videos' +import { VideoPrivacy, VideoAbuseState, VideoImportState } from '../../shared/models/videos' // Do not use barrels, remain constants as independent as possible import { buildPath, isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core-utils' import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type' import { invert } from 'lodash' -import { VideoImportState } from '../../shared/models/videos/video-import-state.enum' // Use a variable to reload the configuration if we need let config: IConfig = require('config') diff --git a/server/models/video/video-caption.ts b/server/models/video/video-caption.ts index 4a25097f8..3593646a2 100644 --- a/server/models/video/video-caption.ts +++ b/server/models/video/video-caption.ts @@ -15,7 +15,7 @@ import { import { throwIfNotValid } from '../utils' import { VideoModel } from './video' import { isVideoCaptionLanguageValid } from '../../helpers/custom-validators/video-captions' -import { VideoCaption } from '../../../shared/models/videos/video-caption.model' +import { VideoCaption } from '../../../shared/models/videos/caption/video-caption.model' import { CONFIG, STATIC_PATHS, VIDEO_LANGUAGES } from '../../initializers' import { join } from 'path' import { logger } from '../../helpers/logger' diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts index b91cb75c2..1cad8998c 100644 --- a/server/tests/api/server/follows.ts +++ b/server/tests/api/server/follows.ts @@ -27,7 +27,7 @@ import { import { rateVideo } from '../../utils/videos/videos' import { waitJobs } from '../../utils/server/jobs' import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions' -import { VideoCaption } from '../../../../shared/models/videos/video-caption.model' +import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' const expect = chai.expect diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts index ba9ebbdd6..6e441410d 100644 --- a/server/tests/api/videos/video-captions.ts +++ b/server/tests/api/videos/video-captions.ts @@ -6,7 +6,7 @@ import { checkVideoFilesWereRemoved, doubleFollow, flushAndRunMultipleServers, r import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index' import { waitJobs } from '../../utils/server/jobs' import { createVideoCaption, deleteVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions' -import { VideoCaption } from '../../../../shared/models/videos/video-caption.model' +import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' const expect = chai.expect diff --git a/server/tests/utils/videos/video-abuses.ts b/server/tests/utils/videos/video-abuses.ts index 5f138d6b3..14907e6a0 100644 --- a/server/tests/utils/videos/video-abuses.ts +++ b/server/tests/utils/videos/video-abuses.ts @@ -1,5 +1,5 @@ import * as request from 'supertest' -import { VideoAbuseUpdate } from '../../../../shared/models/videos/video-abuse-update.model' +import { VideoAbuseUpdate } from '../../../../shared/models/videos/abuse/video-abuse-update.model' import { makeDeleteRequest, makePutBodyRequest } from '..' function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) { diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts index d3085267f..8eddaa496 100644 --- a/shared/models/users/user.model.ts +++ b/shared/models/users/user.model.ts @@ -1,5 +1,5 @@ import { Account } from '../actors' -import { VideoChannel } from '../videos/video-channel.model' +import { VideoChannel } from '../videos/channel/video-channel.model' import { UserRole } from './user-role' import { NSFWPolicyType } from '../videos/nsfw-policy.type' diff --git a/shared/models/videos/abuse/video-abuse-create.model.ts b/shared/models/videos/abuse/video-abuse-create.model.ts new file mode 100644 index 000000000..db6458275 --- /dev/null +++ b/shared/models/videos/abuse/video-abuse-create.model.ts @@ -0,0 +1,3 @@ +export interface VideoAbuseCreate { + reason: string +} diff --git a/shared/models/videos/abuse/video-abuse-state.model.ts b/shared/models/videos/abuse/video-abuse-state.model.ts new file mode 100644 index 000000000..529f034bd --- /dev/null +++ b/shared/models/videos/abuse/video-abuse-state.model.ts @@ -0,0 +1,5 @@ +export enum VideoAbuseState { + PENDING = 1, + REJECTED = 2, + ACCEPTED = 3 +} diff --git a/shared/models/videos/abuse/video-abuse-update.model.ts b/shared/models/videos/abuse/video-abuse-update.model.ts new file mode 100644 index 000000000..9b32aae48 --- /dev/null +++ b/shared/models/videos/abuse/video-abuse-update.model.ts @@ -0,0 +1,6 @@ +import { VideoAbuseState } from './video-abuse-state.model' + +export interface VideoAbuseUpdate { + moderationComment?: string + state?: VideoAbuseState +} diff --git a/shared/models/videos/abuse/video-abuse.model.ts b/shared/models/videos/abuse/video-abuse.model.ts new file mode 100644 index 000000000..4f668795a --- /dev/null +++ b/shared/models/videos/abuse/video-abuse.model.ts @@ -0,0 +1,20 @@ +import { Account } from '../../actors/index' +import { VideoConstant } from '../video-constant.model' +import { VideoAbuseState } from './video-abuse-state.model' + +export interface VideoAbuse { + id: number + reason: string + reporterAccount: Account + + state: VideoConstant + moderationComment?: string + + video: { + id: number + name: string + uuid: string + } + + createdAt: Date +} diff --git a/shared/models/videos/blacklist/video-blacklist-create.model.ts b/shared/models/videos/blacklist/video-blacklist-create.model.ts new file mode 100644 index 000000000..89c69cb56 --- /dev/null +++ b/shared/models/videos/blacklist/video-blacklist-create.model.ts @@ -0,0 +1,3 @@ +export interface VideoBlacklistCreate { + reason?: string +} diff --git a/shared/models/videos/blacklist/video-blacklist-update.model.ts b/shared/models/videos/blacklist/video-blacklist-update.model.ts new file mode 100644 index 000000000..0a86cf7b0 --- /dev/null +++ b/shared/models/videos/blacklist/video-blacklist-update.model.ts @@ -0,0 +1,3 @@ +export interface VideoBlacklistUpdate { + reason?: string +} diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts new file mode 100644 index 000000000..ef4e5e3a2 --- /dev/null +++ b/shared/models/videos/blacklist/video-blacklist.model.ts @@ -0,0 +1,18 @@ +export interface VideoBlacklist { + id: number + createdAt: Date + updatedAt: Date + reason?: string + + video: { + id: number + name: string + uuid: string + description: string + duration: number + views: number + likes: number + dislikes: number + nsfw: boolean + } +} diff --git a/shared/models/videos/caption/video-caption-update.model.ts b/shared/models/videos/caption/video-caption-update.model.ts new file mode 100644 index 000000000..ff5728715 --- /dev/null +++ b/shared/models/videos/caption/video-caption-update.model.ts @@ -0,0 +1,4 @@ +export interface VideoCaptionUpdate { + language: string + captionfile: Blob +} diff --git a/shared/models/videos/caption/video-caption.model.ts b/shared/models/videos/caption/video-caption.model.ts new file mode 100644 index 000000000..d3c73e1a6 --- /dev/null +++ b/shared/models/videos/caption/video-caption.model.ts @@ -0,0 +1,6 @@ +import { VideoConstant } from '../video-constant.model' + +export interface VideoCaption { + language: VideoConstant + captionPath: string +} diff --git a/shared/models/videos/channel/video-channel-create.model.ts b/shared/models/videos/channel/video-channel-create.model.ts new file mode 100644 index 000000000..08cd5fb84 --- /dev/null +++ b/shared/models/videos/channel/video-channel-create.model.ts @@ -0,0 +1,5 @@ +export interface VideoChannelCreate { + displayName: string + description?: string + support?: string +} diff --git a/shared/models/videos/channel/video-channel-update.model.ts b/shared/models/videos/channel/video-channel-update.model.ts new file mode 100644 index 000000000..3626ce8a9 --- /dev/null +++ b/shared/models/videos/channel/video-channel-update.model.ts @@ -0,0 +1,5 @@ +export interface VideoChannelUpdate { + displayName: string + description?: string + support?: string +} diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts new file mode 100644 index 000000000..92918f66c --- /dev/null +++ b/shared/models/videos/channel/video-channel.model.ts @@ -0,0 +1,11 @@ +import { Actor } from '../../actors/actor.model' +import { Video } from '../video.model' +import { Account } from '../../actors/index' + +export interface VideoChannel extends Actor { + displayName: string + description: string + support: string + isLocal: boolean + ownerAccount?: Account +} diff --git a/shared/models/videos/import/video-import-create.model.ts b/shared/models/videos/import/video-import-create.model.ts new file mode 100644 index 000000000..425477389 --- /dev/null +++ b/shared/models/videos/import/video-import-create.model.ts @@ -0,0 +1,9 @@ +import { VideoUpdate } from '../video-update.model' + +export interface VideoImportCreate extends VideoUpdate { + targetUrl?: string + magnetUri?: string + torrentfile?: Blob + + channelId: number // Required +} diff --git a/shared/models/videos/import/video-import-state.enum.ts b/shared/models/videos/import/video-import-state.enum.ts new file mode 100644 index 000000000..b178fbf3a --- /dev/null +++ b/shared/models/videos/import/video-import-state.enum.ts @@ -0,0 +1,5 @@ +export enum VideoImportState { + PENDING = 1, + SUCCESS = 2, + FAILED = 3 +} diff --git a/shared/models/videos/import/video-import.model.ts b/shared/models/videos/import/video-import.model.ts new file mode 100644 index 000000000..e2a56617d --- /dev/null +++ b/shared/models/videos/import/video-import.model.ts @@ -0,0 +1,18 @@ +import { Video } from '../video.model' +import { VideoConstant } from '../video-constant.model' +import { VideoImportState } from './video-import-state.enum' + +export interface VideoImport { + id: number + + targetUrl: string + magnetUri: string + torrentName: string + + createdAt: string + updatedAt: string + state: VideoConstant + error?: string + + video?: Video & { tags: string[] } +} diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index b99dd2d8f..6b579cf3e 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts @@ -1,16 +1,16 @@ -export * from './user-video-rate-update.model' -export * from './user-video-rate.model' -export * from './user-video-rate.type' -export * from './video-abuse-state.model' -export * from './video-abuse-create.model' -export * from './video-abuse.model' -export * from './video-abuse-update.model' -export * from './video-blacklist.model' -export * from './video-blacklist-create.model' -export * from './video-blacklist-update.model' -export * from './video-channel-create.model' -export * from './video-channel-update.model' -export * from './video-channel.model' +export * from './rate/user-video-rate-update.model' +export * from './rate/user-video-rate.model' +export * from './rate/user-video-rate.type' +export * from './abuse/video-abuse-state.model' +export * from './abuse/video-abuse-create.model' +export * from './abuse/video-abuse.model' +export * from './abuse/video-abuse-update.model' +export * from './blacklist/video-blacklist.model' +export * from './blacklist/video-blacklist-create.model' +export * from './blacklist/video-blacklist-update.model' +export * from './channel/video-channel-create.model' +export * from './channel/video-channel-update.model' +export * from './channel/video-channel.model' export * from './video-create.model' export * from './video-privacy.enum' export * from './video-rate.type' @@ -18,8 +18,8 @@ export * from './video-resolution.enum' export * from './video-update.model' export * from './video.model' export * from './video-state.enum' -export * from './video-caption-update.model' -export * from './video-import-create.model' -export * from './video-import-state.enum' -export * from './video-import.model' +export * from './caption/video-caption-update.model' +export * from './import/video-import-create.model' +export * from './import/video-import-state.enum' +export * from './import/video-import.model' export { VideoConstant } from './video-constant.model' diff --git a/shared/models/videos/rate/user-video-rate-update.model.ts b/shared/models/videos/rate/user-video-rate-update.model.ts new file mode 100644 index 000000000..85e89271a --- /dev/null +++ b/shared/models/videos/rate/user-video-rate-update.model.ts @@ -0,0 +1,5 @@ +import { UserVideoRateType } from './user-video-rate.type' + +export interface UserVideoRateUpdate { + rating: UserVideoRateType +} diff --git a/shared/models/videos/rate/user-video-rate.model.ts b/shared/models/videos/rate/user-video-rate.model.ts new file mode 100644 index 000000000..d39a1c3d5 --- /dev/null +++ b/shared/models/videos/rate/user-video-rate.model.ts @@ -0,0 +1,6 @@ +import { UserVideoRateType } from './user-video-rate.type' + +export interface UserVideoRate { + videoId: number + rating: UserVideoRateType +} diff --git a/shared/models/videos/rate/user-video-rate.type.ts b/shared/models/videos/rate/user-video-rate.type.ts new file mode 100644 index 000000000..a4d9c7e39 --- /dev/null +++ b/shared/models/videos/rate/user-video-rate.type.ts @@ -0,0 +1 @@ +export type UserVideoRateType = 'like' | 'dislike' | 'none' diff --git a/shared/models/videos/user-video-rate-update.model.ts b/shared/models/videos/user-video-rate-update.model.ts deleted file mode 100644 index 85e89271a..000000000 --- a/shared/models/videos/user-video-rate-update.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { UserVideoRateType } from './user-video-rate.type' - -export interface UserVideoRateUpdate { - rating: UserVideoRateType -} diff --git a/shared/models/videos/user-video-rate.model.ts b/shared/models/videos/user-video-rate.model.ts deleted file mode 100644 index d39a1c3d5..000000000 --- a/shared/models/videos/user-video-rate.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { UserVideoRateType } from './user-video-rate.type' - -export interface UserVideoRate { - videoId: number - rating: UserVideoRateType -} diff --git a/shared/models/videos/user-video-rate.type.ts b/shared/models/videos/user-video-rate.type.ts deleted file mode 100644 index a4d9c7e39..000000000 --- a/shared/models/videos/user-video-rate.type.ts +++ /dev/null @@ -1 +0,0 @@ -export type UserVideoRateType = 'like' | 'dislike' | 'none' diff --git a/shared/models/videos/video-abuse-create.model.ts b/shared/models/videos/video-abuse-create.model.ts deleted file mode 100644 index db6458275..000000000 --- a/shared/models/videos/video-abuse-create.model.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface VideoAbuseCreate { - reason: string -} diff --git a/shared/models/videos/video-abuse-state.model.ts b/shared/models/videos/video-abuse-state.model.ts deleted file mode 100644 index 529f034bd..000000000 --- a/shared/models/videos/video-abuse-state.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export enum VideoAbuseState { - PENDING = 1, - REJECTED = 2, - ACCEPTED = 3 -} diff --git a/shared/models/videos/video-abuse-update.model.ts b/shared/models/videos/video-abuse-update.model.ts deleted file mode 100644 index 9b32aae48..000000000 --- a/shared/models/videos/video-abuse-update.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { VideoAbuseState } from './video-abuse-state.model' - -export interface VideoAbuseUpdate { - moderationComment?: string - state?: VideoAbuseState -} diff --git a/shared/models/videos/video-abuse.model.ts b/shared/models/videos/video-abuse.model.ts deleted file mode 100644 index b2319aa00..000000000 --- a/shared/models/videos/video-abuse.model.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Account } from '../actors' -import { VideoConstant } from './video-constant.model' -import { VideoAbuseState } from './video-abuse-state.model' - -export interface VideoAbuse { - id: number - reason: string - reporterAccount: Account - - state: VideoConstant - moderationComment?: string - - video: { - id: number - name: string - uuid: string - } - - createdAt: Date -} diff --git a/shared/models/videos/video-blacklist-create.model.ts b/shared/models/videos/video-blacklist-create.model.ts deleted file mode 100644 index 89c69cb56..000000000 --- a/shared/models/videos/video-blacklist-create.model.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface VideoBlacklistCreate { - reason?: string -} diff --git a/shared/models/videos/video-blacklist-update.model.ts b/shared/models/videos/video-blacklist-update.model.ts deleted file mode 100644 index 0a86cf7b0..000000000 --- a/shared/models/videos/video-blacklist-update.model.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface VideoBlacklistUpdate { - reason?: string -} diff --git a/shared/models/videos/video-blacklist.model.ts b/shared/models/videos/video-blacklist.model.ts deleted file mode 100644 index ef4e5e3a2..000000000 --- a/shared/models/videos/video-blacklist.model.ts +++ /dev/null @@ -1,18 +0,0 @@ -export interface VideoBlacklist { - id: number - createdAt: Date - updatedAt: Date - reason?: string - - video: { - id: number - name: string - uuid: string - description: string - duration: number - views: number - likes: number - dislikes: number - nsfw: boolean - } -} diff --git a/shared/models/videos/video-caption-update.model.ts b/shared/models/videos/video-caption-update.model.ts deleted file mode 100644 index ff5728715..000000000 --- a/shared/models/videos/video-caption-update.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface VideoCaptionUpdate { - language: string - captionfile: Blob -} diff --git a/shared/models/videos/video-caption.model.ts b/shared/models/videos/video-caption.model.ts deleted file mode 100644 index 4695224ce..000000000 --- a/shared/models/videos/video-caption.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { VideoConstant } from './video-constant.model' - -export interface VideoCaption { - language: VideoConstant - captionPath: string -} diff --git a/shared/models/videos/video-channel-create.model.ts b/shared/models/videos/video-channel-create.model.ts deleted file mode 100644 index 08cd5fb84..000000000 --- a/shared/models/videos/video-channel-create.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface VideoChannelCreate { - displayName: string - description?: string - support?: string -} diff --git a/shared/models/videos/video-channel-update.model.ts b/shared/models/videos/video-channel-update.model.ts deleted file mode 100644 index 3626ce8a9..000000000 --- a/shared/models/videos/video-channel-update.model.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface VideoChannelUpdate { - displayName: string - description?: string - support?: string -} diff --git a/shared/models/videos/video-channel.model.ts b/shared/models/videos/video-channel.model.ts deleted file mode 100644 index 6e61183a7..000000000 --- a/shared/models/videos/video-channel.model.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Actor } from '../actors/actor.model' -import { Video } from './video.model' -import { Account } from '../actors' - -export interface VideoChannel extends Actor { - displayName: string - description: string - support: string - isLocal: boolean - ownerAccount?: Account -} diff --git a/shared/models/videos/video-import-create.model.ts b/shared/models/videos/video-import-create.model.ts deleted file mode 100644 index e76084e06..000000000 --- a/shared/models/videos/video-import-create.model.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { VideoUpdate } from './video-update.model' - -export interface VideoImportCreate extends VideoUpdate { - targetUrl?: string - magnetUri?: string - torrentfile?: Blob - - channelId: number // Required -} diff --git a/shared/models/videos/video-import-state.enum.ts b/shared/models/videos/video-import-state.enum.ts deleted file mode 100644 index b178fbf3a..000000000 --- a/shared/models/videos/video-import-state.enum.ts +++ /dev/null @@ -1,5 +0,0 @@ -export enum VideoImportState { - PENDING = 1, - SUCCESS = 2, - FAILED = 3 -} diff --git a/shared/models/videos/video-import.model.ts b/shared/models/videos/video-import.model.ts deleted file mode 100644 index 293854006..000000000 --- a/shared/models/videos/video-import.model.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Video } from './video.model' -import { VideoConstant } from './video-constant.model' -import { VideoImportState } from './video-import-state.enum' - -export interface VideoImport { - id: number - - targetUrl: string - magnetUri: string - torrentName: string - - createdAt: string - updatedAt: string - state: VideoConstant - error?: string - - video?: Video & { tags: string[] } -} diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 8dfa96069..8e1fbe444 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts @@ -1,7 +1,7 @@ import { VideoResolution, VideoState } from '../../index' import { Account } from '../actors' import { Avatar } from '../avatars/avatar.model' -import { VideoChannel } from './video-channel.model' +import { VideoChannel } from './channel/video-channel.model' import { VideoPrivacy } from './video-privacy.enum' import { VideoScheduleUpdate } from './video-schedule-update.model' import { VideoConstant } from './video-constant.model' -- cgit v1.2.3