From 09cababd79f9d445aa027c93cdfe823745fa041a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Feb 2018 18:04:46 +0100 Subject: Add stats route --- shared/models/config/about.model.ts | 7 ----- shared/models/config/custom-config.model.ts | 42 ----------------------------- shared/models/config/customization.model.ts | 8 ------ shared/models/config/server-config.model.ts | 40 --------------------------- shared/models/index.ts | 4 +-- shared/models/job.model.ts | 17 ------------ shared/models/server/about.model.ts | 7 +++++ shared/models/server/custom-config.model.ts | 42 +++++++++++++++++++++++++++++ shared/models/server/customization.model.ts | 8 ++++++ shared/models/server/job.model.ts | 17 ++++++++++++ shared/models/server/server-config.model.ts | 40 +++++++++++++++++++++++++++ shared/models/server/server-stats.model.ts | 12 +++++++++ 12 files changed, 128 insertions(+), 116 deletions(-) delete mode 100644 shared/models/config/about.model.ts delete mode 100644 shared/models/config/custom-config.model.ts delete mode 100644 shared/models/config/customization.model.ts delete mode 100644 shared/models/config/server-config.model.ts delete mode 100644 shared/models/job.model.ts create mode 100644 shared/models/server/about.model.ts create mode 100644 shared/models/server/custom-config.model.ts create mode 100644 shared/models/server/customization.model.ts create mode 100644 shared/models/server/job.model.ts create mode 100644 shared/models/server/server-config.model.ts create mode 100644 shared/models/server/server-stats.model.ts (limited to 'shared') diff --git a/shared/models/config/about.model.ts b/shared/models/config/about.model.ts deleted file mode 100644 index 7d11da850..000000000 --- a/shared/models/config/about.model.ts +++ /dev/null @@ -1,7 +0,0 @@ -export interface About { - instance: { - name: string - description: string - terms: string - } -} diff --git a/shared/models/config/custom-config.model.ts b/shared/models/config/custom-config.model.ts deleted file mode 100644 index 46d0a86ef..000000000 --- a/shared/models/config/custom-config.model.ts +++ /dev/null @@ -1,42 +0,0 @@ -export interface CustomConfig { - instance: { - name: string - description: string - terms: string - customizations: { - javascript?: string - css?: string - } - } - - cache: { - previews: { - size: number - } - } - - signup: { - enabled: boolean - limit: number - } - - admin: { - email: string - } - - user: { - videoQuota: number - } - - transcoding: { - enabled: boolean - threads: number - resolutions: { - '240p': boolean - '360p': boolean - '480p': boolean - '720p': boolean - '1080p': boolean - } - } -} diff --git a/shared/models/config/customization.model.ts b/shared/models/config/customization.model.ts deleted file mode 100644 index 4e4d0d193..000000000 --- a/shared/models/config/customization.model.ts +++ /dev/null @@ -1,8 +0,0 @@ -export interface Customization { - instance: { - customization: { - javascript: string - css: string - } - } -} diff --git a/shared/models/config/server-config.model.ts b/shared/models/config/server-config.model.ts deleted file mode 100644 index 004cf6ddb..000000000 --- a/shared/models/config/server-config.model.ts +++ /dev/null @@ -1,40 +0,0 @@ -export interface ServerConfig { - serverVersion: string - - instance: { - name: string; - customizations: { - javascript: string - css: string - } - } - - signup: { - allowed: boolean - } - - transcoding: { - enabledResolutions: number[] - } - - avatar: { - file: { - size: { - max: number - }, - extensions: string[] - } - } - - video: { - image: { - size: { - max: number - } - extensions: string[] - }, - file: { - extensions: string[] - } - } -} diff --git a/shared/models/index.ts b/shared/models/index.ts index 1b877774c..ae3a44777 100644 --- a/shared/models/index.ts +++ b/shared/models/index.ts @@ -2,7 +2,7 @@ export * from './actors' export * from './activitypub' export * from './users' export * from './videos' -export * from './job.model' +export * from './server/job.model' export * from './oauth-client-local.model' export * from './result-list.model' -export * from './config/server-config.model' +export * from './server/server-config.model' diff --git a/shared/models/job.model.ts b/shared/models/job.model.ts deleted file mode 100644 index 5ebb75a5c..000000000 --- a/shared/models/job.model.ts +++ /dev/null @@ -1,17 +0,0 @@ -export type JobState = 'active' | 'complete' | 'failed' | 'inactive' | 'delayed' - -export type JobType = 'activitypub-http-unicast' | - 'activitypub-http-broadcast' | - 'activitypub-http-fetcher' | - 'video-file' | - 'email' - -export interface Job { - id: number - state: JobState - type: JobType - data: any, - error: any, - createdAt: Date - updatedAt: Date -} diff --git a/shared/models/server/about.model.ts b/shared/models/server/about.model.ts new file mode 100644 index 000000000..7d11da850 --- /dev/null +++ b/shared/models/server/about.model.ts @@ -0,0 +1,7 @@ +export interface About { + instance: { + name: string + description: string + terms: string + } +} diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts new file mode 100644 index 000000000..46d0a86ef --- /dev/null +++ b/shared/models/server/custom-config.model.ts @@ -0,0 +1,42 @@ +export interface CustomConfig { + instance: { + name: string + description: string + terms: string + customizations: { + javascript?: string + css?: string + } + } + + cache: { + previews: { + size: number + } + } + + signup: { + enabled: boolean + limit: number + } + + admin: { + email: string + } + + user: { + videoQuota: number + } + + transcoding: { + enabled: boolean + threads: number + resolutions: { + '240p': boolean + '360p': boolean + '480p': boolean + '720p': boolean + '1080p': boolean + } + } +} diff --git a/shared/models/server/customization.model.ts b/shared/models/server/customization.model.ts new file mode 100644 index 000000000..4e4d0d193 --- /dev/null +++ b/shared/models/server/customization.model.ts @@ -0,0 +1,8 @@ +export interface Customization { + instance: { + customization: { + javascript: string + css: string + } + } +} diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts new file mode 100644 index 000000000..5ebb75a5c --- /dev/null +++ b/shared/models/server/job.model.ts @@ -0,0 +1,17 @@ +export type JobState = 'active' | 'complete' | 'failed' | 'inactive' | 'delayed' + +export type JobType = 'activitypub-http-unicast' | + 'activitypub-http-broadcast' | + 'activitypub-http-fetcher' | + 'video-file' | + 'email' + +export interface Job { + id: number + state: JobState + type: JobType + data: any, + error: any, + createdAt: Date + updatedAt: Date +} diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts new file mode 100644 index 000000000..004cf6ddb --- /dev/null +++ b/shared/models/server/server-config.model.ts @@ -0,0 +1,40 @@ +export interface ServerConfig { + serverVersion: string + + instance: { + name: string; + customizations: { + javascript: string + css: string + } + } + + signup: { + allowed: boolean + } + + transcoding: { + enabledResolutions: number[] + } + + avatar: { + file: { + size: { + max: number + }, + extensions: string[] + } + } + + video: { + image: { + size: { + max: number + } + extensions: string[] + }, + file: { + extensions: string[] + } + } +} diff --git a/shared/models/server/server-stats.model.ts b/shared/models/server/server-stats.model.ts new file mode 100644 index 000000000..5c1bf3468 --- /dev/null +++ b/shared/models/server/server-stats.model.ts @@ -0,0 +1,12 @@ +export interface ServerStats { + totalUsers: number + totalLocalVideos: number + totalLocalVideoViews: number + totalLocalVideoComments: number + + totalVideos: number + totalVideoComments: number + + totalInstanceFollowers: number + totalInstanceFollowing: number +} -- cgit v1.2.3