10 files changed, 71 insertions, 35 deletions
diff --git a/shared/models/videos/abuse/index.ts b/shared/models/videos/abuse/index.ts
new file mode 100644
index 000000000..bdeef1dad
--- /dev/null
+++ b/shared/models/videos/abuse/index.ts
@@ -0,0 +1,5 @@
+export * from './video-abuse-create.model'
+export * from './video-abuse-state.model'
+export * from './video-abuse-update.model'
+export * from './video-abuse-video-is.type'
+export * from './video-abuse.model'
diff --git a/shared/models/videos/blacklist/index.ts b/shared/models/videos/blacklist/index.ts
new file mode 100644
index 000000000..66082be34
--- /dev/null
+++ b/shared/models/videos/blacklist/index.ts
@@ -0,0 +1,3 @@
+export * from './video-blacklist.model'
+export * from './video-blacklist-create.model'
+export * from './video-blacklist-update.model'
diff --git a/shared/models/videos/caption/index.ts b/shared/models/videos/caption/index.ts
new file mode 100644
index 000000000..2a5ff512d
--- /dev/null
+++ b/shared/models/videos/caption/index.ts
@@ -0,0 +1,2 @@
+export * from './video-caption.model'
+export * from './video-caption-update.model'
diff --git a/shared/models/videos/channel/index.ts b/shared/models/videos/channel/index.ts
new file mode 100644
index 000000000..9dbaa42da
--- /dev/null
+++ b/shared/models/videos/channel/index.ts
@@ -0,0 +1,3 @@
+export * from './video-channel-create.model'
+export * from './video-channel-update.model'
+export * from './video-channel.model'
diff --git a/shared/models/videos/import/index.ts b/shared/models/videos/import/index.ts
new file mode 100644
index 000000000..8884ee8f2
--- /dev/null
+++ b/shared/models/videos/import/index.ts
@@ -0,0 +1,3 @@
+export * from './video-import-create.model'
+export * from './video-import-state.enum'
+export * from './video-import.model'
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index 58bd1ebd7..e1d96b40a 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -1,41 +1,38 @@
-export * from './rate/user-video-rate-update.model'
+export * from './abuse'
-export * from './rate/user-video-rate.model'
+export * from './blacklist'
-export * from './rate/account-video-rate.model'
+export * from './caption'
-export * from './rate/user-video-rate.type'
+export * from './channel'
-export * from './abuse/video-abuse-state.model'
+export * from './import'
-export * from './abuse/video-abuse-create.model'
+export * from './playlist'
-export * from './abuse/video-abuse-reason.model'
+export * from './rate'
-export * from './abuse/video-abuse.model'
-export * from './abuse/video-abuse-update.model'
+export * from './nsfw-policy.type'
-export * from './blacklist/video-blacklist.model'
-export * from './blacklist/video-blacklist-create.model'
+export * from './thumbnail.type'
-export * from './blacklist/video-blacklist-update.model'
-export * from './channel/video-channel-create.model'
+export * from './video-change-ownership-accept.model'
-export * from './channel/video-channel-update.model'
-export * from './channel/video-channel.model'
-export * from './playlist/video-playlist-create.model'
-export * from './playlist/video-playlist-element-create.model'
-export * from './playlist/video-playlist-element-update.model'
-export * from './playlist/video-playlist-privacy.model'
-export * from './playlist/video-playlist-type.model'
-export * from './playlist/video-playlist-update.model'
-export * from './playlist/video-playlist.model'
-export * from './playlist/video-playlist-element.model'
-export * from './video-change-ownership.model'
 export * from './video-change-ownership-create.model'
+export * from './video-change-ownership.model'
+export * from './video-comment.model'
+export * from './video-constant.model'
 export * from './video-create.model'
+export * from './video-file-metadata'
 export * from './video-file.model'
 export * from './video-privacy.enum'
+export * from './video-query.type'
 export * from './video-rate.type'
 export * from './video-resolution.enum'
-export * from './video-update.model'
-export * from './video.model'
+export * from './video-schedule-update.model'
-export * from './video-query.type'
+export * from './video-sort-field.type'
 export * from './video-state.enum'
+export * from './video-streaming-playlist.model'
+export * from './video-streaming-playlist.type'
 export * from './video-transcoding-fps.model'
-export * from './caption/video-caption.model'
-export * from './caption/video-caption-update.model'
+export * from './video-update.model'
-export * from './import/video-import-create.model'
+export * from './video.model'
-export * from './import/video-import-state.enum'
-export * from './import/video-import.model'
-export * from './video-constant.model'
diff --git a/shared/models/videos/playlist/index.ts b/shared/models/videos/playlist/index.ts
new file mode 100644
index 000000000..99f7e9bab
--- /dev/null
+++ b/shared/models/videos/playlist/index.ts
@@ -0,0 +1,10 @@
+export * from './video-exist-in-playlist.model'
+export * from './video-playlist-create.model'
+export * from './video-playlist-element-create.model'
+export * from './video-playlist-element-update.model'
+export * from './video-playlist-element.model'
+export * from './video-playlist-privacy.model'
+export * from './video-playlist-reorder.model'
+export * from './video-playlist-type.model'
+export * from './video-playlist-update.model'
+export * from './video-playlist.model'
diff --git a/shared/models/videos/rate/index.ts b/shared/models/videos/rate/index.ts
new file mode 100644
index 000000000..06aa691bd
--- /dev/null
+++ b/shared/models/videos/rate/index.ts
@@ -0,0 +1,5 @@
+export * from './user-video-rate-update.model'
+export * from './user-video-rate.model'
+export * from './account-video-rate.model'
+export * from './user-video-rate.type'
diff --git a/shared/models/videos/video-file-metadata.ts b/shared/models/videos/video-file-metadata.ts
index 15683cacf..010bf7cf5 100644
--- a/shared/models/videos/video-file-metadata.ts
+++ b/shared/models/videos/video-file-metadata.ts
@@ -1,5 +1,5 @@
-import { FfprobeData } from "fluent-ffmpeg"
+import { FfprobeData } from 'fluent-ffmpeg'
-import { DeepOmit } from "@server/models/utils"
+import { DeepOmit } from '../../core-utils'
 export type VideoFileMetadataModel = DeepOmit<FfprobeData, 'filename'>
diff --git a/shared/models/videos/video-sort-field.type.ts b/shared/models/videos/video-sort-field.type.ts
new file mode 100644
index 000000000..f2e70f5fa
--- /dev/null
+++ b/shared/models/videos/video-sort-field.type.ts
@@ -0,0 +1,8 @@
+export type VideoSortField =
+  'name' | '-name' |
+  'duration' | '-duration' |
+  'publishedAt' | '-publishedAt' |
+  'createdAt' | '-createdAt' |
+  'views' | '-views' |
+  'likes' | '-likes' |
+  'trending' | '-trending'

diff --git a/shared/models/videos/abuse/index.ts b/shared/models/videos/abuse/index.ts new file mode 100644 index 000000000..bdeef1dad --- /dev/null +++ b/shared/models/videos/abuse/index.ts
@@ -0,0 +1,5 @@
		1	export * from './video-abuse-create.model'
		2	export * from './video-abuse-state.model'
		3	export * from './video-abuse-update.model'
		4	export * from './video-abuse-video-is.type'
		5	export * from './video-abuse.model'


diff --git a/shared/models/videos/blacklist/index.ts b/shared/models/videos/blacklist/index.ts new file mode 100644 index 000000000..66082be34 --- /dev/null +++ b/shared/models/videos/blacklist/index.ts
@@ -0,0 +1,3 @@
		1	export * from './video-blacklist.model'
		2	export * from './video-blacklist-create.model'
		3	export * from './video-blacklist-update.model'


diff --git a/shared/models/videos/caption/index.ts b/shared/models/videos/caption/index.ts new file mode 100644 index 000000000..2a5ff512d --- /dev/null +++ b/shared/models/videos/caption/index.ts
@@ -0,0 +1,2 @@
		1	export * from './video-caption.model'
		2	export * from './video-caption-update.model'


diff --git a/shared/models/videos/channel/index.ts b/shared/models/videos/channel/index.ts new file mode 100644 index 000000000..9dbaa42da --- /dev/null +++ b/shared/models/videos/channel/index.ts
@@ -0,0 +1,3 @@
		1	export * from './video-channel-create.model'
		2	export * from './video-channel-update.model'
		3	export * from './video-channel.model'


diff --git a/shared/models/videos/import/index.ts b/shared/models/videos/import/index.ts new file mode 100644 index 000000000..8884ee8f2 --- /dev/null +++ b/shared/models/videos/import/index.ts
@@ -0,0 +1,3 @@
		1	export * from './video-import-create.model'
		2	export * from './video-import-state.enum'
		3	export * from './video-import.model'


diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index 58bd1ebd7..e1d96b40a 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts
@@ -1,41 +1,38 @@
1	export * from './rate/user-video-rate-update.model'	1	export * from './abuse'
2	export * from './rate/user-video-rate.model'	2	export * from './blacklist'
3	export * from './rate/account-video-rate.model'	3	export * from './caption'
4	export * from './rate/user-video-rate.type'	4	export * from './channel'
5	export * from './abuse/video-abuse-state.model'	5	export * from './import'
6	export * from './abuse/video-abuse-create.model'	6	export * from './playlist'
7	export * from './abuse/video-abuse-reason.model'	7	export * from './rate'
8	export * from './abuse/video-abuse.model'	8
9	export * from './abuse/video-abuse-update.model'	9	export * from './nsfw-policy.type'
10	export * from './blacklist/video-blacklist.model'	10
11	export * from './blacklist/video-blacklist-create.model'	11	export * from './thumbnail.type'
12	export * from './blacklist/video-blacklist-update.model'	12
13	export * from './channel/video-channel-create.model'	13	export * from './video-change-ownership-accept.model'
14	export * from './channel/video-channel-update.model'
15	export * from './channel/video-channel.model'
16	export * from './playlist/video-playlist-create.model'
17	export * from './playlist/video-playlist-element-create.model'
18	export * from './playlist/video-playlist-element-update.model'
19	export * from './playlist/video-playlist-privacy.model'
20	export * from './playlist/video-playlist-type.model'
21	export * from './playlist/video-playlist-update.model'
22	export * from './playlist/video-playlist.model'
23	export * from './playlist/video-playlist-element.model'
24	export * from './video-change-ownership.model'
25	export * from './video-change-ownership-create.model'	14	export * from './video-change-ownership-create.model'
		15	export * from './video-change-ownership.model'
		16
		17	export * from './video-comment.model'
		18	export * from './video-constant.model'
26	export * from './video-create.model'	19	export * from './video-create.model'
		20	export * from './video-file-metadata'
27	export * from './video-file.model'	21	export * from './video-file.model'
		22
28	export * from './video-privacy.enum'	23	export * from './video-privacy.enum'
		24	export * from './video-query.type'
29	export * from './video-rate.type'	25	export * from './video-rate.type'
30	export * from './video-resolution.enum'	26	export * from './video-resolution.enum'
31	export * from './video-update.model'	27
32	export * from './video.model'	28	export * from './video-schedule-update.model'
33	export * from './video-query.type'	29	export * from './video-sort-field.type'
34	export * from './video-state.enum'	30	export * from './video-state.enum'
		31
		32	export * from './video-streaming-playlist.model'
		33	export * from './video-streaming-playlist.type'
		34
35	export * from './video-transcoding-fps.model'	35	export * from './video-transcoding-fps.model'
36	export * from './caption/video-caption.model'	36
37	export * from './caption/video-caption-update.model'	37	export * from './video-update.model'
38	export * from './import/video-import-create.model'	38	export * from './video.model'
39	export * from './import/video-import-state.enum'
40	export * from './import/video-import.model'
41	export * from './video-constant.model'


diff --git a/shared/models/videos/playlist/index.ts b/shared/models/videos/playlist/index.ts new file mode 100644 index 000000000..99f7e9bab --- /dev/null +++ b/shared/models/videos/playlist/index.ts
@@ -0,0 +1,10 @@
		1	export * from './video-exist-in-playlist.model'
		2	export * from './video-playlist-create.model'
		3	export * from './video-playlist-element-create.model'
		4	export * from './video-playlist-element-update.model'
		5	export * from './video-playlist-element.model'
		6	export * from './video-playlist-privacy.model'
		7	export * from './video-playlist-reorder.model'
		8	export * from './video-playlist-type.model'
		9	export * from './video-playlist-update.model'
		10	export * from './video-playlist.model'


diff --git a/shared/models/videos/rate/index.ts b/shared/models/videos/rate/index.ts new file mode 100644 index 000000000..06aa691bd --- /dev/null +++ b/shared/models/videos/rate/index.ts
@@ -0,0 +1,5 @@
		1
		2	export * from './user-video-rate-update.model'
		3	export * from './user-video-rate.model'
		4	export * from './account-video-rate.model'
		5	export * from './user-video-rate.type'


diff --git a/shared/models/videos/video-file-metadata.ts b/shared/models/videos/video-file-metadata.ts index 15683cacf..010bf7cf5 100644 --- a/shared/models/videos/video-file-metadata.ts +++ b/shared/models/videos/video-file-metadata.ts
@@ -1,5 +1,5 @@
1	import { FfprobeData } from "fluent-ffmpeg"	1	import { FfprobeData } from 'fluent-ffmpeg'
2	import { DeepOmit } from "@server/models/utils"	2	import { DeepOmit } from '../../core-utils'
3		3
4	export type VideoFileMetadataModel = DeepOmit<FfprobeData, 'filename'>	4	export type VideoFileMetadataModel = DeepOmit<FfprobeData, 'filename'>
5		5


diff --git a/shared/models/videos/video-sort-field.type.ts b/shared/models/videos/video-sort-field.type.ts new file mode 100644 index 000000000..f2e70f5fa --- /dev/null +++ b/shared/models/videos/video-sort-field.type.ts
@@ -0,0 +1,8 @@
		1	export type VideoSortField =
		2	'name' \| '-name' \|
		3	'duration' \| '-duration' \|
		4	'publishedAt' \| '-publishedAt' \|
		5	'createdAt' \| '-createdAt' \|
		6	'views' \| '-views' \|
		7	'likes' \| '-likes' \|
		8	'trending' \| '-trending'