From 2422c46b27790d94fd29a7092170cee5a1b56008 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 15 Feb 2018 14:46:26 +0100 Subject: Implement support field in video and video channel --- shared/models/activitypub/activitypub-actor.ts | 3 +-- shared/models/activitypub/objects/video-torrent-object.ts | 1 + shared/models/actors/account.model.ts | 1 + shared/models/users/user-update-me.model.ts | 1 + shared/models/videos/video-channel-create.model.ts | 1 + shared/models/videos/video-channel-update.model.ts | 3 ++- shared/models/videos/video-channel.model.ts | 1 + shared/models/videos/video-create.model.ts | 1 + shared/models/videos/video-update.model.ts | 1 + shared/models/videos/video.model.ts | 1 + 10 files changed, 11 insertions(+), 3 deletions(-) (limited to 'shared/models') 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 { summary: string attributedTo: ActivityPubAttributedTo[] + support?: string uuid: string publicKey: { id: string @@ -26,11 +27,9 @@ export interface ActivityPubActor { publicKeyPem: string } - // Not used icon: { type: 'Image' mediaType: 'image/png' url: string } - // liked: string } 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 { updated: string mediaType: 'text/markdown' content: string + support: string icon: ActivityIconObject url: ActivityUrlObject[] likes?: ActivityPubOrderedCollection 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' export interface Account extends Actor { displayName: string + description: string } 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 @@ export interface UserUpdateMe { + description?: string displayNSFW?: boolean autoPlayVideo?: boolean 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 @@ export interface VideoChannelCreate { name: string description?: string + support?: string } 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 @@ export interface VideoChannelUpdate { name: string - description: string + description?: string + support?: string } 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' export interface VideoChannel extends Actor { displayName: string description: string + support: string isLocal: boolean owner?: { 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 { licence?: number language?: number description?: string + support?: string channelId: number nsfw: boolean 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 { licence?: number language?: number description?: string + support?: string privacy?: VideoPrivacy tags?: string[] 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 { privacy: VideoPrivacy privacyLabel: string descriptionPath: string + support: string channel: VideoChannel tags: string[] files: VideoFile[] -- cgit v1.2.3