diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-03 17:00:19 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-06 11:19:16 +0200 |
commit | b2977eecb8eb5d599df0c6a7ab99a437a6a969c7 (patch) | |
tree | ee5f59a932f4395a2e4148e84cdde02cdc32e26f /shared/models | |
parent | 590fb5069038e69898123bb795f789683216d837 (diff) | |
download | PeerTube-b2977eecb8eb5d599df0c6a7ab99a437a6a969c7.tar.gz PeerTube-b2977eecb8eb5d599df0c6a7ab99a437a6a969c7.tar.zst PeerTube-b2977eecb8eb5d599df0c6a7ab99a437a6a969c7.zip |
Fix fps federation
Diffstat (limited to 'shared/models')
-rw-r--r-- | shared/models/activitypub/objects/common-objects.ts | 2 | ||||
-rw-r--r-- | shared/models/server/server-config.model.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/video-import.model.ts | 2 |
3 files changed, 4 insertions, 3 deletions
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 { | |||
22 | mimeType: 'video/mp4' | 'video/webm' | 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' | 22 | mimeType: 'video/mp4' | 'video/webm' | 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' |
23 | href: string | 23 | href: string |
24 | width: number | 24 | width: number |
25 | |||
25 | size?: number | 26 | size?: number |
27 | fps?: number | ||
26 | } | 28 | } |
27 | 29 | ||
28 | export interface ActivityPubAttributedTo { | 30 | 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 @@ | |||
1 | import { NSFWPolicyType } from '../videos/nsfw-policy.type' | 1 | import { NSFWPolicyType } from '../videos/nsfw-policy.type' |
2 | import { CONFIG } from '../../../server/initializers' | ||
3 | 2 | ||
4 | export interface ServerConfig { | 3 | export interface ServerConfig { |
5 | serverVersion: string | 4 | serverVersion: string |
@@ -25,7 +24,7 @@ export interface ServerConfig { | |||
25 | } | 24 | } |
26 | 25 | ||
27 | import: { | 26 | import: { |
28 | video: { | 27 | videos: { |
29 | http: { | 28 | http: { |
30 | enabled: boolean | 29 | enabled: boolean |
31 | } | 30 | } |
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 @@ | |||
1 | import { Video } from './video.model' | 1 | import { Video } from './video.model' |
2 | import { VideoConstant } from './video-constant.model' | 2 | import { VideoConstant } from './video-constant.model' |
3 | import { VideoImportState } from '../../index' | 3 | import { VideoImportState } from './video-import-state.enum' |
4 | 4 | ||
5 | export interface VideoImport { | 5 | export interface VideoImport { |
6 | id: number | 6 | id: number |