From b2977eecb8eb5d599df0c6a7ab99a437a6a969c7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Aug 2018 17:00:19 +0200 Subject: Fix fps federation --- shared/models/activitypub/objects/common-objects.ts | 2 ++ shared/models/server/server-config.model.ts | 3 +-- shared/models/videos/video-import.model.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'shared') diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index 3127d0565..5b2b3adae 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts @@ -22,7 +22,9 @@ export interface ActivityUrlObject { mimeType: 'video/mp4' | 'video/webm' | 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' href: string width: number + size?: number + fps?: number } export interface ActivityPubAttributedTo { diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 38e1941d8..2cafedbbc 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts @@ -1,5 +1,4 @@ import { NSFWPolicyType } from '../videos/nsfw-policy.type' -import { CONFIG } from '../../../server/initializers' export interface ServerConfig { serverVersion: string @@ -25,7 +24,7 @@ export interface ServerConfig { } import: { - video: { + videos: { http: { enabled: boolean } diff --git a/shared/models/videos/video-import.model.ts b/shared/models/videos/video-import.model.ts index c8dea0246..a5c582c67 100644 --- a/shared/models/videos/video-import.model.ts +++ b/shared/models/videos/video-import.model.ts @@ -1,6 +1,6 @@ import { Video } from './video.model' import { VideoConstant } from './video-constant.model' -import { VideoImportState } from '../../index' +import { VideoImportState } from './video-import-state.enum' export interface VideoImport { id: number -- cgit v1.2.3