aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-09-17 13:59:02 +0200
committerChocobozzz <chocobozzz@cpy.re>2020-11-09 15:33:04 +0100
commitde6310b2fcbb8a6b79c546b23dfa1920724faaa7 (patch)
tree57e73811ef2cf0c903782704284c9cbfc1598adb /server/models
parent1ef65f4c034cc53ab5d55417e52d60e1f7fc1ddb (diff)
downloadPeerTube-de6310b2fcbb8a6b79c546b23dfa1920724faaa7.tar.gz
PeerTube-de6310b2fcbb8a6b79c546b23dfa1920724faaa7.tar.zst
PeerTube-de6310b2fcbb8a6b79c546b23dfa1920724faaa7.zip
Handle live federation
Diffstat (limited to 'server/models')
-rw-r--r--server/models/video/video-format-utils.ts5
-rw-r--r--server/models/video/video.ts4
2 files changed, 5 insertions, 4 deletions
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 @@
1import { Video, VideoDetails } from '../../../shared/models/videos' 1import { Video, VideoDetails } from '../../../shared/models/videos'
2import { VideoModel } from './video' 2import { VideoModel } from './video'
3import { ActivityTagObject, ActivityUrlObject, VideoTorrentObject } from '../../../shared/models/activitypub/objects' 3import { ActivityTagObject, ActivityUrlObject, VideoObject } from '../../../shared/models/activitypub/objects'
4import { MIMETYPES, WEBSERVER } from '../../initializers/constants' 4import { MIMETYPES, WEBSERVER } from '../../initializers/constants'
5import { VideoCaptionModel } from './video-caption' 5import { VideoCaptionModel } from './video-caption'
6import { 6import {
@@ -262,7 +262,7 @@ function addVideoFilesInAPAcc (
262 } 262 }
263} 263}
264 264
265function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject { 265function videoModelToActivityPubObject (video: MVideoAP): VideoObject {
266 const { baseUrlHttp, baseUrlWs } = video.getBaseUrls() 266 const { baseUrlHttp, baseUrlWs } = video.getBaseUrls()
267 if (!video.Tags) video.Tags = [] 267 if (!video.Tags) video.Tags = []
268 268
@@ -351,6 +351,7 @@ function videoModelToActivityPubObject (video: MVideoAP): VideoTorrentObject {
351 views: video.views, 351 views: video.views,
352 sensitive: video.nsfw, 352 sensitive: video.nsfw,
353 waitTranscoding: video.waitTranscoding, 353 waitTranscoding: video.waitTranscoding,
354 isLiveBroadcast: video.isLive,
354 state: video.state, 355 state: video.state,
355 commentsEnabled: video.commentsEnabled, 356 commentsEnabled: video.commentsEnabled,
356 downloadEnabled: video.downloadEnabled, 357 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'
31import { ModelCache } from '@server/models/model-cache' 31import { ModelCache } from '@server/models/model-cache'
32import { VideoFile } from '@shared/models/videos/video-file.model' 32import { VideoFile } from '@shared/models/videos/video-file.model'
33import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared' 33import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared'
34import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' 34import { VideoObject } from '../../../shared/models/activitypub/objects'
35import { Video, VideoDetails } from '../../../shared/models/videos' 35import { Video, VideoDetails } from '../../../shared/models/videos'
36import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type' 36import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type'
37import { VideoFilter } from '../../../shared/models/videos/video-query.type' 37import { VideoFilter } from '../../../shared/models/videos/video-query.type'
@@ -1763,7 +1763,7 @@ export class VideoModel extends Model<VideoModel> {
1763 return videoFilesModelToFormattedJSON(this, baseUrlHttp, baseUrlWs, files) 1763 return videoFilesModelToFormattedJSON(this, baseUrlHttp, baseUrlWs, files)
1764 } 1764 }
1765 1765
1766 toActivityPubObject (this: MVideoAP): VideoTorrentObject { 1766 toActivityPubObject (this: MVideoAP): VideoObject {
1767 return videoModelToActivityPubObject(this) 1767 return videoModelToActivityPubObject(this)
1768 } 1768 }
1769 1769