From de6310b2fcbb8a6b79c546b23dfa1920724faaa7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Sep 2020 13:59:02 +0200 Subject: Handle live federation --- server/models/video/video-format-utils.ts | 5 +++-- server/models/video/video.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'server/models/video') diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts index 0dbd92a43..92bde7773 100644 --- a/server/models/video/video-format-utils.ts +++ b/server/models/video/video-format-utils.ts @@ -1,6 +1,6 @@ import { Video, VideoDetails } from '../../../shared/models/videos' import { VideoModel } from './video' -import { ActivityTagObject, ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects' +import { ActivityTagObject, ActivityUrlObject, VideoObject } from '../../../shared/models/activitypub/objects' import { MIMETYPES, WEBSERVER } from '../../initializers/constants' import { VideoCaptionModel } from './video-caption' import { @@ -262,7 +262,7 @@ function addVideoFilesInAPAcc ( } } -function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { +function videoModelToActivityPubObject (video: MVideoAP): VideoObject { const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() if (!video.Tags) video.Tags = [] @@ -351,6 +351,7 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { views: video.views, sensitive: video.nsfw, waitTranscoding: video.waitTranscoding, + isLiveBroadcast: video.isLive, state: video.state, commentsEnabled: video.commentsEnabled, downloadEnabled: video.downloadEnabled, diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 1037730e3..a3e3b6cfe 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -31,7 +31,7 @@ import { getServerActor } from '@server/models/application/application' import { ModelCache } from '@server/models/model-cache' import { VideoFile } from '@shared/models/videos/video-file.model' import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared' -import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' +import { VideoObject } from '../../../shared/models/activitypub/objects' import { Video, VideoDetails } from '../../../shared/models/videos' import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type' import { VideoFilter } from '../../../shared/models/videos/video-query.type' @@ -1763,7 +1763,7 @@ export class VideoModel extends Model { return videoFilesModelToFormattedJSON(this, baseUrlHttp, baseUrlWs, files) } - toActivityPubObject (this: MVideoAP): VideoTorrentObject { + toActivityPubObject (this: MVideoAP): VideoObject { return videoModelToActivityPubObject(this) } -- cgit v1.2.3