From 0a6658fdcbd779ada8f3758048c326e997902d5a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Jul 2017 16:01:56 +0200 Subject: Use global uuid instead of remoteId for videos --- shared/models/pods/remote-video/remote-qadu-video-request.model.ts | 2 +- shared/models/pods/remote-video/remote-video-create-request.model.ts | 2 +- shared/models/pods/remote-video/remote-video-event-request.model.ts | 2 +- shared/models/pods/remote-video/remote-video-remove-request.model.ts | 2 +- .../pods/remote-video/remote-video-report-abuse-request.model.ts | 2 +- shared/models/pods/remote-video/remote-video-update-request.model.ts | 2 +- shared/models/videos/user-video-rate.model.ts | 2 +- shared/models/videos/video-abuse.model.ts | 2 +- shared/models/videos/video-blacklist.model.ts | 2 +- shared/models/videos/video.model.ts | 3 ++- 10 files changed, 11 insertions(+), 10 deletions(-) (limited to 'shared') diff --git a/shared/models/pods/remote-video/remote-qadu-video-request.model.ts b/shared/models/pods/remote-video/remote-qadu-video-request.model.ts index 0f84e3f13..6128c5801 100644 --- a/shared/models/pods/remote-video/remote-qadu-video-request.model.ts +++ b/shared/models/pods/remote-video/remote-qadu-video-request.model.ts @@ -1,5 +1,5 @@ export interface RemoteQaduVideoData { - remoteId: string + uuid: string views?: number likes?: number dislikes?: number 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 6babb0083..b6a570e42 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 @@ -1,7 +1,7 @@ import { RemoteVideoRequest } from './remote-video-request.model' export interface RemoteVideoCreateData { - remoteId: string + uuid: string author: string tags: string[] name: string diff --git a/shared/models/pods/remote-video/remote-video-event-request.model.ts b/shared/models/pods/remote-video/remote-video-event-request.model.ts index 84df1ca2f..ecc374750 100644 --- a/shared/models/pods/remote-video/remote-video-event-request.model.ts +++ b/shared/models/pods/remote-video/remote-video-event-request.model.ts @@ -1,7 +1,7 @@ export type RemoteVideoEventType = 'views' | 'likes' | 'dislikes' export interface RemoteVideoEventData { - remoteId: string + uuid: string eventType: RemoteVideoEventType count: number } 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 95ee38661..0686dc8ab 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 @@ -1,7 +1,7 @@ import { RemoteVideoRequest } from './remote-video-request.model' export interface RemoteVideoRemoveData { - remoteId: string + uuid: string } export interface RemoteVideoRemoveRequest extends RemoteVideoRequest { diff --git a/shared/models/pods/remote-video/remote-video-report-abuse-request.model.ts b/shared/models/pods/remote-video/remote-video-report-abuse-request.model.ts index 9059c92e0..05ad132cf 100644 --- a/shared/models/pods/remote-video/remote-video-report-abuse-request.model.ts +++ b/shared/models/pods/remote-video/remote-video-report-abuse-request.model.ts @@ -1,7 +1,7 @@ import { RemoteVideoRequest } from './remote-video-request.model' export interface RemoteVideoReportAbuseData { - videoRemoteId: string + videoUUID: string reporterUsername: string reportReason: string } 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 67ddbc1e4..805548563 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,5 +1,5 @@ export interface RemoteVideoUpdateData { - remoteId: string + uuid: string tags: string[] name: string extname: string diff --git a/shared/models/videos/user-video-rate.model.ts b/shared/models/videos/user-video-rate.model.ts index 4b9c574d8..d39a1c3d5 100644 --- a/shared/models/videos/user-video-rate.model.ts +++ b/shared/models/videos/user-video-rate.model.ts @@ -1,6 +1,6 @@ import { UserVideoRateType } from './user-video-rate.type' export interface UserVideoRate { - videoId: string + videoId: number rating: UserVideoRateType } diff --git a/shared/models/videos/video-abuse.model.ts b/shared/models/videos/video-abuse.model.ts index 72e32cbc7..e005a1fd5 100644 --- a/shared/models/videos/video-abuse.model.ts +++ b/shared/models/videos/video-abuse.model.ts @@ -3,6 +3,6 @@ export interface VideoAbuse { reporterPodHost: string reason: string reporterUsername: string - videoId: string + videoId: number createdAt: Date } diff --git a/shared/models/videos/video-blacklist.model.ts b/shared/models/videos/video-blacklist.model.ts index f894bb065..6086250ac 100644 --- a/shared/models/videos/video-blacklist.model.ts +++ b/shared/models/videos/video-blacklist.model.ts @@ -1,5 +1,5 @@ export interface BlacklistedVideo { id: number - videoId: string + videoId: number createdAt: Date } diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 2e35f005c..d472cc8fb 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts @@ -1,5 +1,6 @@ export interface Video { - id: string + id: number + uuid: string author: string createdAt: Date categoryLabel: string -- cgit v1.2.3