diff options
author | Chocobozzz <me@florianbigard.com> | 2018-02-15 14:46:26 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-02-15 15:29:07 +0100 |
commit | 2422c46b27790d94fd29a7092170cee5a1b56008 (patch) | |
tree | d5c1942ce20cadb27a551d87c789edfe92f5b105 /shared | |
parent | 34cbef8c6cc912143a421413bdd832c4adcc556a (diff) | |
download | PeerTube-2422c46b27790d94fd29a7092170cee5a1b56008.tar.gz PeerTube-2422c46b27790d94fd29a7092170cee5a1b56008.tar.zst PeerTube-2422c46b27790d94fd29a7092170cee5a1b56008.zip |
Implement support field in video and video channel
Diffstat (limited to 'shared')
-rw-r--r-- | shared/models/activitypub/activitypub-actor.ts | 3 | ||||
-rw-r--r-- | shared/models/activitypub/objects/video-torrent-object.ts | 1 | ||||
-rw-r--r-- | shared/models/actors/account.model.ts | 1 | ||||
-rw-r--r-- | shared/models/users/user-update-me.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/video-channel-create.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/video-channel-update.model.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/video-channel.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/video-create.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/video-update.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 1 |
10 files changed, 11 insertions, 3 deletions
diff --git a/shared/models/activitypub/activitypub-actor.ts b/shared/models/activitypub/activitypub-actor.ts index 78256e9be..119bc22d4 100644 --- a/shared/models/activitypub/activitypub-actor.ts +++ b/shared/models/activitypub/activitypub-actor.ts | |||
@@ -19,6 +19,7 @@ export interface ActivityPubActor { | |||
19 | summary: string | 19 | summary: string |
20 | attributedTo: ActivityPubAttributedTo[] | 20 | attributedTo: ActivityPubAttributedTo[] |
21 | 21 | ||
22 | support?: string | ||
22 | uuid: string | 23 | uuid: string |
23 | publicKey: { | 24 | publicKey: { |
24 | id: string | 25 | id: string |
@@ -26,11 +27,9 @@ export interface ActivityPubActor { | |||
26 | publicKeyPem: string | 27 | publicKeyPem: string |
27 | } | 28 | } |
28 | 29 | ||
29 | // Not used | ||
30 | icon: { | 30 | icon: { |
31 | type: 'Image' | 31 | type: 'Image' |
32 | mediaType: 'image/png' | 32 | mediaType: 'image/png' |
33 | url: string | 33 | url: string |
34 | } | 34 | } |
35 | // liked: string | ||
36 | } | 35 | } |
diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts index 6f03bf7d0..02820a4cb 100644 --- a/shared/models/activitypub/objects/video-torrent-object.ts +++ b/shared/models/activitypub/objects/video-torrent-object.ts | |||
@@ -23,6 +23,7 @@ export interface VideoTorrentObject { | |||
23 | updated: string | 23 | updated: string |
24 | mediaType: 'text/markdown' | 24 | mediaType: 'text/markdown' |
25 | content: string | 25 | content: string |
26 | support: string | ||
26 | icon: ActivityIconObject | 27 | icon: ActivityIconObject |
27 | url: ActivityUrlObject[] | 28 | url: ActivityUrlObject[] |
28 | likes?: ActivityPubOrderedCollection<string> | 29 | likes?: ActivityPubOrderedCollection<string> |
diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts index 5cc12c18f..e1117486d 100644 --- a/shared/models/actors/account.model.ts +++ b/shared/models/actors/account.model.ts | |||
@@ -2,4 +2,5 @@ import { Actor } from './actor.model' | |||
2 | 2 | ||
3 | export interface Account extends Actor { | 3 | export interface Account extends Actor { |
4 | displayName: string | 4 | displayName: string |
5 | description: string | ||
5 | } | 6 | } |
diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts index 83417a7bd..b84233329 100644 --- a/shared/models/users/user-update-me.model.ts +++ b/shared/models/users/user-update-me.model.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | export interface UserUpdateMe { | 1 | export interface UserUpdateMe { |
2 | description?: string | ||
2 | displayNSFW?: boolean | 3 | displayNSFW?: boolean |
3 | autoPlayVideo?: boolean | 4 | autoPlayVideo?: boolean |
4 | email?: string | 5 | email?: string |
diff --git a/shared/models/videos/video-channel-create.model.ts b/shared/models/videos/video-channel-create.model.ts index f309c8f45..cd6bae965 100644 --- a/shared/models/videos/video-channel-create.model.ts +++ b/shared/models/videos/video-channel-create.model.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | export interface VideoChannelCreate { | 1 | export interface VideoChannelCreate { |
2 | name: string | 2 | name: string |
3 | description?: string | 3 | description?: string |
4 | support?: string | ||
4 | } | 5 | } |
diff --git a/shared/models/videos/video-channel-update.model.ts b/shared/models/videos/video-channel-update.model.ts index 4e98e39a8..73a0a6709 100644 --- a/shared/models/videos/video-channel-update.model.ts +++ b/shared/models/videos/video-channel-update.model.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | export interface VideoChannelUpdate { | 1 | export interface VideoChannelUpdate { |
2 | name: string | 2 | name: string |
3 | description: string | 3 | description?: string |
4 | support?: string | ||
4 | } | 5 | } |
diff --git a/shared/models/videos/video-channel.model.ts b/shared/models/videos/video-channel.model.ts index b164fb555..470295a81 100644 --- a/shared/models/videos/video-channel.model.ts +++ b/shared/models/videos/video-channel.model.ts | |||
@@ -4,6 +4,7 @@ import { Video } from './video.model' | |||
4 | export interface VideoChannel extends Actor { | 4 | export interface VideoChannel extends Actor { |
5 | displayName: string | 5 | displayName: string |
6 | description: string | 6 | description: string |
7 | support: string | ||
7 | isLocal: boolean | 8 | isLocal: boolean |
8 | owner?: { | 9 | owner?: { |
9 | name: string | 10 | name: string |
diff --git a/shared/models/videos/video-create.model.ts b/shared/models/videos/video-create.model.ts index 139c2579e..567a4c79a 100644 --- a/shared/models/videos/video-create.model.ts +++ b/shared/models/videos/video-create.model.ts | |||
@@ -5,6 +5,7 @@ export interface VideoCreate { | |||
5 | licence?: number | 5 | licence?: number |
6 | language?: number | 6 | language?: number |
7 | description?: string | 7 | description?: string |
8 | support?: string | ||
8 | channelId: number | 9 | channelId: number |
9 | nsfw: boolean | 10 | nsfw: boolean |
10 | name: string | 11 | name: string |
diff --git a/shared/models/videos/video-update.model.ts b/shared/models/videos/video-update.model.ts index fc772f77b..0b26484d7 100644 --- a/shared/models/videos/video-update.model.ts +++ b/shared/models/videos/video-update.model.ts | |||
@@ -6,6 +6,7 @@ export interface VideoUpdate { | |||
6 | licence?: number | 6 | licence?: number |
7 | language?: number | 7 | language?: number |
8 | description?: string | 8 | description?: string |
9 | support?: string | ||
9 | privacy?: VideoPrivacy | 10 | privacy?: VideoPrivacy |
10 | tags?: string[] | 11 | tags?: string[] |
11 | commentsEnabled?: boolean | 12 | commentsEnabled?: boolean |
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 39d1edc06..deb81da44 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -41,6 +41,7 @@ export interface VideoDetails extends Video { | |||
41 | privacy: VideoPrivacy | 41 | privacy: VideoPrivacy |
42 | privacyLabel: string | 42 | privacyLabel: string |
43 | descriptionPath: string | 43 | descriptionPath: string |
44 | support: string | ||
44 | channel: VideoChannel | 45 | channel: VideoChannel |
45 | tags: string[] | 46 | tags: string[] |
46 | files: VideoFile[] | 47 | files: VideoFile[] |