17 files changed, 119 insertions, 7 deletions

diff --git a/shared/models/pods/remote-video/index.ts b/shared/models/pods/remote-video/index.ts
index c88116849..918b9e1f6 100644
--- a/shared/models/pods/remote-video/index.ts
+++ b/shared/models/pods/remote-video/index.ts
@@ -1,7 +1,12 @@
 export * from './remote-qadu-video-request.model'
+export * from './remote-video-author-create-request.model'
+export * from './remote-video-author-remove-request.model'
 export * from './remote-video-event-request.model'
 export * from './remote-video-request.model'
 export * from './remote-video-create-request.model'
 export * from './remote-video-update-request.model'
 export * from './remote-video-remove-request.model'
+export * from './remote-video-channel-create-request.model'
+export * from './remote-video-channel-update-request.model'
+export * from './remote-video-channel-remove-request.model'
 export * from './remote-video-report-abuse-request.model'
diff --git a/shared/models/pods/remote-video/remote-video-author-create-request.model.ts b/shared/models/pods/remote-video/remote-video-author-create-request.model.ts
new file mode 100644
index 000000000..ae364d177
--- /dev/null
+++ b/shared/models/pods/remote-video/remote-video-author-create-request.model.ts
@@ -0,0 +1,11 @@
+import { RemoteVideoRequest } from './remote-video-request.model'
+
+export interface RemoteVideoAuthorCreateData {
+  uuid: string
+  name: string
+}
+
+export interface RemoteVideoAuthorCreateRequest extends RemoteVideoRequest {
+  type: 'add-author'
+  data: RemoteVideoAuthorCreateData
+}
diff --git a/shared/models/pods/remote-video/remote-video-author-remove-request.model.ts b/shared/models/pods/remote-video/remote-video-author-remove-request.model.ts
new file mode 100644
index 000000000..8738e92f0
--- /dev/null
+++ b/shared/models/pods/remote-video/remote-video-author-remove-request.model.ts
@@ -0,0 +1,10 @@
+import { RemoteVideoRequest } from './remote-video-request.model'
+
+export interface RemoteVideoAuthorRemoveData {
+  uuid: string
+}
+
+export interface RemoteVideoAuthorRemoveRequest extends RemoteVideoRequest {
+  type: 'remove-author'
+  data: RemoteVideoAuthorRemoveData
+}
diff --git a/shared/models/pods/remote-video/remote-video-channel-create-request.model.ts b/shared/models/pods/remote-video/remote-video-channel-create-request.model.ts
new file mode 100644
index 000000000..54163a2db
--- /dev/null
+++ b/shared/models/pods/remote-video/remote-video-channel-create-request.model.ts
@@ -0,0 +1,15 @@
+import { RemoteVideoRequest } from './remote-video-request.model'
+
+export interface RemoteVideoChannelCreateData {
+  uuid: string
+  name: string
+  description: string
+  createdAt: Date
+  updatedAt: Date
+  ownerUUID: string
+}
+
+export interface RemoteVideoChannelCreateRequest extends RemoteVideoRequest {
+  type: 'add-channel'
+  data: RemoteVideoChannelCreateData
+}
diff --git a/shared/models/pods/remote-video/remote-video-channel-remove-request.model.ts b/shared/models/pods/remote-video/remote-video-channel-remove-request.model.ts
new file mode 100644
index 000000000..7aa3fe112
--- /dev/null
+++ b/shared/models/pods/remote-video/remote-video-channel-remove-request.model.ts
@@ -0,0 +1,10 @@
+import { RemoteVideoRequest } from './remote-video-request.model'
+
+export interface RemoteVideoChannelRemoveData {
+  uuid: string
+}
+
+export interface RemoteVideoChannelRemoveRequest extends RemoteVideoRequest {
+  type: 'remove-channel'
+  data: RemoteVideoChannelRemoveData
+}
diff --git a/shared/models/pods/remote-video/remote-video-channel-update-request.model.ts b/shared/models/pods/remote-video/remote-video-channel-update-request.model.ts
new file mode 100644
index 000000000..70250d109
--- /dev/null
+++ b/shared/models/pods/remote-video/remote-video-channel-update-request.model.ts
@@ -0,0 +1,15 @@
+import { RemoteVideoRequest } from './remote-video-request.model'
+
+export interface RemoteVideoChannelUpdateData {
+  uuid: string
+  name: string
+  description: string
+  createdAt: Date
+  updatedAt: Date
+  ownerUUID: string
+}
+
+export interface RemoteVideoChannelUpdateRequest extends RemoteVideoRequest {
+  type: 'update-channel'
+  data: RemoteVideoChannelUpdateData
+}
diff --git a/shared/models/pods/remote-video/remote-video-create-request.model.ts b/shared/models/pods/remote-video/remote-video-create-request.model.ts
index 98425e4d9..e00e81214 100644
--- a/shared/models/pods/remote-video/remote-video-create-request.model.ts
+++ b/shared/models/pods/remote-video/remote-video-create-request.model.ts
@@ -2,7 +2,7 @@ import { RemoteVideoRequest } from './remote-video-request.model'
 
 export interface RemoteVideoCreateData {
   uuid: string
-  author: string
+  channelUUID: string
   tags: string[]
   name: string
   category: number
@@ -26,6 +26,6 @@ export interface RemoteVideoCreateData {
 }
 
 export interface RemoteVideoCreateRequest extends RemoteVideoRequest {
-  type: 'add'
+  type: 'add-video'
   data: RemoteVideoCreateData
 }
diff --git a/shared/models/pods/remote-video/remote-video-remove-request.model.ts b/shared/models/pods/remote-video/remote-video-remove-request.model.ts
index 0686dc8ab..79a5e0a5f 100644
--- a/shared/models/pods/remote-video/remote-video-remove-request.model.ts
+++ b/shared/models/pods/remote-video/remote-video-remove-request.model.ts
@@ -5,6 +5,6 @@ export interface RemoteVideoRemoveData {
 }
 
 export interface RemoteVideoRemoveRequest extends RemoteVideoRequest {
-  type: 'remove'
+  type: 'remove-video'
   data: RemoteVideoRemoveData
 }
diff --git a/shared/models/pods/remote-video/remote-video-request.model.ts b/shared/models/pods/remote-video/remote-video-request.model.ts
index e5052a23d..56f8136c2 100644
--- a/shared/models/pods/remote-video/remote-video-request.model.ts
+++ b/shared/models/pods/remote-video/remote-video-request.model.ts
@@ -1,4 +1,9 @@
 export interface RemoteVideoRequest {
-  type: 'add' | 'update' | 'remove' | 'report-abuse'
+  type: RemoteVideoRequestType
   data: any
 }
+
+export type RemoteVideoRequestType = 'add-video' | 'update-video' | 'remove-video' |
+                                     'add-channel' | 'update-channel' | 'remove-channel' |
+                                     'report-abuse' |
+                                     'add-author' | 'remove-author'
diff --git a/shared/models/pods/remote-video/remote-video-update-request.model.ts b/shared/models/pods/remote-video/remote-video-update-request.model.ts
index 7f34a30ae..90c42fc28 100644
--- a/shared/models/pods/remote-video/remote-video-update-request.model.ts
+++ b/shared/models/pods/remote-video/remote-video-update-request.model.ts
@@ -1,3 +1,5 @@
+import { RemoteVideoRequest } from './remote-video-request.model'
+
 export interface RemoteVideoUpdateData {
   uuid: string
   tags: string[]
@@ -21,7 +23,7 @@ export interface RemoteVideoUpdateData {
   }[]
 }
 
-export interface RemoteVideoUpdateRequest {
-  type: 'update'
+export interface RemoteVideoUpdateRequest extends RemoteVideoRequest {
+  type: 'update-video'
   data: RemoteVideoUpdateData
 }
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index 867a6dde5..175e72f28 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -1,4 +1,5 @@
 import { UserRole } from './user-role.type'
+import { VideoChannel } from '../videos/video-channel.model'
 
 export interface User {
   id: number
@@ -7,5 +8,10 @@ export interface User {
   displayNSFW: boolean
   role: UserRole
   videoQuota: number
-  createdAt: Date
+  createdAt: Date,
+  author: {
+    id: number
+    uuid: string
+  }
+  videoChannels?: VideoChannel[]
 }
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index 35144dbad..2a3912f06 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -4,6 +4,9 @@ export * from './user-video-rate.type'
 export * from './video-abuse-create.model'
 export * from './video-abuse.model'
 export * from './video-blacklist.model'
+export * from './video-channel-create.model'
+export * from './video-channel-update.model'
+export * from './video-channel.model'
 export * from './video-create.model'
 export * from './video-rate.type'
 export * from './video-resolution.enum'
diff --git a/shared/models/videos/video-channel-create.model.ts b/shared/models/videos/video-channel-create.model.ts
new file mode 100644
index 000000000..f309c8f45
--- /dev/null
+++ b/shared/models/videos/video-channel-create.model.ts
@@ -0,0 +1,4 @@
+export interface VideoChannelCreate {
+  name: string
+  description?: string
+}
diff --git a/shared/models/videos/video-channel-update.model.ts b/shared/models/videos/video-channel-update.model.ts
new file mode 100644
index 000000000..4e98e39a8
--- /dev/null
+++ b/shared/models/videos/video-channel-update.model.ts
@@ -0,0 +1,4 @@
+export interface VideoChannelUpdate {
+  name: string
+  description: string
+}
diff --git a/shared/models/videos/video-channel.model.ts b/shared/models/videos/video-channel.model.ts
new file mode 100644
index 000000000..ee56c54b6
--- /dev/null
+++ b/shared/models/videos/video-channel.model.ts
@@ -0,0 +1,15 @@
+import { Video } from './video.model'
+
+export interface VideoChannel {
+  id: number
+  name: string
+  description: string
+  isLocal: boolean
+  createdAt: Date | string
+  updatedAt: Date | string
+  owner?: {
+    name: string
+    uuid: string
+  }
+  videos?: Video[]
+}
diff --git a/shared/models/videos/video-create.model.ts b/shared/models/videos/video-create.model.ts
index 5c0b498ce..4d0e83520 100644
--- a/shared/models/videos/video-create.model.ts
+++ b/shared/models/videos/video-create.model.ts
@@ -3,6 +3,7 @@ export interface VideoCreate {
   licence: number
   language: number
   description: string
+  channelId: number
   nsfw: boolean
   name: string
   tags: string[]
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 8e47ac069..32463933d 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,3 +1,5 @@
+import { VideoChannel } from './video-channel.model'
+
 export interface VideoFile {
   magnetUri: string
   resolution: number
@@ -32,5 +34,9 @@ export interface Video {
   likes: number
   dislikes: number
   nsfw: boolean
+}
+
+export interface VideoDetails extends Video {
+  channel: VideoChannel
   files: VideoFile[]
 }