diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /shared/models/videos | |
parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'shared/models/videos')
-rw-r--r-- | shared/models/videos/blacklist/video-blacklist-create.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/blacklist/video-blacklist.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/shared/models/videos/blacklist/video-blacklist-create.model.ts b/shared/models/videos/blacklist/video-blacklist-create.model.ts index 89c69cb56..6e7d36421 100644 --- a/shared/models/videos/blacklist/video-blacklist-create.model.ts +++ b/shared/models/videos/blacklist/video-blacklist-create.model.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | export interface VideoBlacklistCreate { | 1 | export interface VideoBlacklistCreate { |
2 | reason?: string | 2 | reason?: string |
3 | unfederate?: boolean | ||
3 | } | 4 | } |
diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts index ef4e5e3a2..4bd976190 100644 --- a/shared/models/videos/blacklist/video-blacklist.model.ts +++ b/shared/models/videos/blacklist/video-blacklist.model.ts | |||
@@ -2,6 +2,7 @@ export interface VideoBlacklist { | |||
2 | id: number | 2 | id: number |
3 | createdAt: Date | 3 | createdAt: Date |
4 | updatedAt: Date | 4 | updatedAt: Date |
5 | unfederated: boolean | ||
5 | reason?: string | 6 | reason?: string |
6 | 7 | ||
7 | video: { | 8 | video: { |
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 4a9fa58b1..022876a0b 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -24,7 +24,7 @@ export interface VideoChannelAttribute { | |||
24 | displayName: string | 24 | displayName: string |
25 | url: string | 25 | url: string |
26 | host: string | 26 | host: string |
27 | avatar: Avatar | 27 | avatar?: Avatar |
28 | } | 28 | } |
29 | 29 | ||
30 | export interface AccountAttribute { | 30 | export interface AccountAttribute { |
@@ -34,7 +34,7 @@ export interface AccountAttribute { | |||
34 | displayName: string | 34 | displayName: string |
35 | url: string | 35 | url: string |
36 | host: string | 36 | host: string |
37 | avatar: Avatar | 37 | avatar?: Avatar |
38 | } | 38 | } |
39 | 39 | ||
40 | export interface Video { | 40 | export interface Video { |