From 608624252466acf9f1d9ee1c1170bd4fe4d18d18 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 Nov 2017 11:00:25 +0100 Subject: Rename Pod -> Server --- shared/models/accounts/follow.model.ts | 7 +++++ shared/models/index.ts | 2 -- shared/models/pods/index.ts | 3 -- shared/models/pods/pod-signature.model.ts | 4 --- shared/models/pods/pod.model.ts | 6 ---- shared/models/pods/remote-video/index.ts | 12 -------- .../remote-qadu-video-request.model.ts | 10 ------- .../remote-video-author-create-request.model.ts | 11 -------- .../remote-video-author-remove-request.model.ts | 10 ------- .../remote-video-channel-create-request.model.ts | 15 ---------- .../remote-video-channel-remove-request.model.ts | 10 ------- .../remote-video-channel-update-request.model.ts | 15 ---------- .../remote-video-create-request.model.ts | 32 ---------------------- .../remote-video-event-request.model.ts | 11 -------- .../remote-video-remove-request.model.ts | 10 ------- .../remote-video-report-abuse-request.model.ts | 12 -------- .../remote-video/remote-video-request.model.ts | 9 ------ .../remote-video-update-request.model.ts | 30 -------------------- shared/models/request-scheduler.model.ts | 19 ------------- shared/models/videos/video-abuse.model.ts | 2 +- shared/models/videos/video.model.ts | 2 +- 21 files changed, 9 insertions(+), 223 deletions(-) delete mode 100644 shared/models/pods/index.ts delete mode 100644 shared/models/pods/pod-signature.model.ts delete mode 100644 shared/models/pods/pod.model.ts delete mode 100644 shared/models/pods/remote-video/index.ts delete mode 100644 shared/models/pods/remote-video/remote-qadu-video-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-author-create-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-author-remove-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-channel-create-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-channel-remove-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-channel-update-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-create-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-event-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-remove-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-report-abuse-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-request.model.ts delete mode 100644 shared/models/pods/remote-video/remote-video-update-request.model.ts delete mode 100644 shared/models/request-scheduler.model.ts (limited to 'shared/models') diff --git a/shared/models/accounts/follow.model.ts b/shared/models/accounts/follow.model.ts index 80cfe07e4..8094634c1 100644 --- a/shared/models/accounts/follow.model.ts +++ b/shared/models/accounts/follow.model.ts @@ -1 +1,8 @@ export type FollowState = 'pending' | 'accepted' + +export interface AccountFollow { + id: number + name: string + score?: number // Used for followers + host: string +} diff --git a/shared/models/index.ts b/shared/models/index.ts index 28decac03..faf616bfc 100644 --- a/shared/models/index.ts +++ b/shared/models/index.ts @@ -1,10 +1,8 @@ export * from './accounts' export * from './activitypub' -export * from './pods' export * from './users' export * from './videos' export * from './job.model' export * from './oauth-client-local.model' export * from './result-list.model' -export * from './request-scheduler.model' export * from './server-config.model' diff --git a/shared/models/pods/index.ts b/shared/models/pods/index.ts deleted file mode 100644 index f59d01540..000000000 --- a/shared/models/pods/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './pod-signature.model' -export * from './pod.model' -export * from './remote-video' diff --git a/shared/models/pods/pod-signature.model.ts b/shared/models/pods/pod-signature.model.ts deleted file mode 100644 index b7988a40c..000000000 --- a/shared/models/pods/pod-signature.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface PodSignature { - host: string - signature: string -} diff --git a/shared/models/pods/pod.model.ts b/shared/models/pods/pod.model.ts deleted file mode 100644 index ff9e8f2f5..000000000 --- a/shared/models/pods/pod.model.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface Pod { - id: number, - host: string, - score: number, - createdAt: Date -} diff --git a/shared/models/pods/remote-video/index.ts b/shared/models/pods/remote-video/index.ts deleted file mode 100644 index 918b9e1f6..000000000 --- a/shared/models/pods/remote-video/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -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-qadu-video-request.model.ts b/shared/models/pods/remote-video/remote-qadu-video-request.model.ts deleted file mode 100644 index 6128c5801..000000000 --- a/shared/models/pods/remote-video/remote-qadu-video-request.model.ts +++ /dev/null @@ -1,10 +0,0 @@ -export interface RemoteQaduVideoData { - uuid: string - views?: number - likes?: number - dislikes?: number -} - -export interface RemoteQaduVideoRequest { - data: RemoteQaduVideoData -} 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 deleted file mode 100644 index ae364d177..000000000 --- a/shared/models/pods/remote-video/remote-video-author-create-request.model.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 8738e92f0..000000000 --- a/shared/models/pods/remote-video/remote-video-author-remove-request.model.ts +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 54163a2db..000000000 --- a/shared/models/pods/remote-video/remote-video-channel-create-request.model.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 7aa3fe112..000000000 --- a/shared/models/pods/remote-video/remote-video-channel-remove-request.model.ts +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 70250d109..000000000 --- a/shared/models/pods/remote-video/remote-video-channel-update-request.model.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 9a382e654..000000000 --- a/shared/models/pods/remote-video/remote-video-create-request.model.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { RemoteVideoRequest } from './remote-video-request.model' - -export interface RemoteVideoCreateData { - uuid: string - channelUUID: string - tags: string[] - name: string - category: number - licence: number - language: number - nsfw: boolean - truncatedDescription: string - duration: number - createdAt: Date - updatedAt: Date - views: number - likes: number - dislikes: number - privacy: number - thumbnailData: string - files: { - infoHash: string - extname: string - resolution: number - size: number - }[] -} - -export interface RemoteVideoCreateRequest extends RemoteVideoRequest { - type: 'add-video' - data: RemoteVideoCreateData -} 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 deleted file mode 100644 index ecc374750..000000000 --- a/shared/models/pods/remote-video/remote-video-event-request.model.ts +++ /dev/null @@ -1,11 +0,0 @@ -export type RemoteVideoEventType = 'views' | 'likes' | 'dislikes' - -export interface RemoteVideoEventData { - uuid: string - eventType: RemoteVideoEventType - count: number -} - -export interface RemoteVideoEventRequest { - data: RemoteVideoEventData -} 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 deleted file mode 100644 index 79a5e0a5f..000000000 --- a/shared/models/pods/remote-video/remote-video-remove-request.model.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { RemoteVideoRequest } from './remote-video-request.model' - -export interface RemoteVideoRemoveData { - uuid: string -} - -export interface RemoteVideoRemoveRequest extends RemoteVideoRequest { - type: 'remove-video' - data: RemoteVideoRemoveData -} 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 deleted file mode 100644 index 05ad132cf..000000000 --- a/shared/models/pods/remote-video/remote-video-report-abuse-request.model.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { RemoteVideoRequest } from './remote-video-request.model' - -export interface RemoteVideoReportAbuseData { - videoUUID: string - reporterUsername: string - reportReason: string -} - -export interface RemoteVideoReportAbuseRequest extends RemoteVideoRequest { - type: 'report-abuse' - data: RemoteVideoReportAbuseData -} diff --git a/shared/models/pods/remote-video/remote-video-request.model.ts b/shared/models/pods/remote-video/remote-video-request.model.ts deleted file mode 100644 index 56f8136c2..000000000 --- a/shared/models/pods/remote-video/remote-video-request.model.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface RemoteVideoRequest { - 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 deleted file mode 100644 index 924489c75..000000000 --- a/shared/models/pods/remote-video/remote-video-update-request.model.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { RemoteVideoRequest } from './remote-video-request.model' - -export interface RemoteVideoUpdateData { - uuid: string - tags: string[] - name: string - category: number - licence: number - language: number - nsfw: boolean - truncatedDescription: string - duration: number - createdAt: Date - updatedAt: Date - views: number - likes: number - dislikes: number - privacy: number - files: { - infoHash: string - extname: string - resolution: number - size: number - }[] -} - -export interface RemoteVideoUpdateRequest extends RemoteVideoRequest { - type: 'update-video' - data: RemoteVideoUpdateData -} diff --git a/shared/models/request-scheduler.model.ts b/shared/models/request-scheduler.model.ts deleted file mode 100644 index 8df184a09..000000000 --- a/shared/models/request-scheduler.model.ts +++ /dev/null @@ -1,19 +0,0 @@ -export type RequestEndpoint = 'videos' - -export type RequestVideoQaduType = 'likes' | 'dislikes' | 'views' - -export type RequestVideoEventType = 'likes' | 'dislikes' | 'views' - -export type RequestSchedulerStatsAttributes = { - totalRequests: number - requestsLimitPods: number - requestsLimitPerPod: number - remainingMilliSeconds: number - milliSecondsInterval: number -} - -export interface RequestSchedulerStats { - requestScheduler: RequestSchedulerStatsAttributes - requestVideoQaduScheduler: RequestSchedulerStatsAttributes - requestVideoEventScheduler: RequestSchedulerStatsAttributes -} diff --git a/shared/models/videos/video-abuse.model.ts b/shared/models/videos/video-abuse.model.ts index e005a1fd5..38041e491 100644 --- a/shared/models/videos/video-abuse.model.ts +++ b/shared/models/videos/video-abuse.model.ts @@ -1,6 +1,6 @@ export interface VideoAbuse { id: number - reporterPodHost: string + reporterServerHost: string reason: string reporterUsername: string videoId: number diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 0606f1aec..08b29425c 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts @@ -26,7 +26,7 @@ export interface Video { duration: number isLocal: boolean name: string - podHost: string + serverHost: string tags: string[] thumbnailPath: string previewPath: string -- cgit v1.2.3