diff options
Diffstat (limited to 'server/models/video/video.ts')
-rw-r--r-- | server/models/video/video.ts | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index dc10aca1a..e2069eb0c 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
@@ -9,7 +9,6 @@ import { VideoTorrentObject } from '../../../shared/models/activitypub/objects/v | |||
9 | import { | 9 | import { |
10 | createTorrentPromise, | 10 | createTorrentPromise, |
11 | generateImageFromVideoFile, | 11 | generateImageFromVideoFile, |
12 | getActivityPubUrl, | ||
13 | getVideoFileHeight, | 12 | getVideoFileHeight, |
14 | isVideoCategoryValid, | 13 | isVideoCategoryValid, |
15 | isVideoDescriptionValid, | 14 | isVideoDescriptionValid, |
@@ -40,13 +39,13 @@ import { | |||
40 | VIDEO_LICENCES, | 39 | VIDEO_LICENCES, |
41 | VIDEO_PRIVACIES | 40 | VIDEO_PRIVACIES |
42 | } from '../../initializers' | 41 | } from '../../initializers' |
43 | import { sendDeleteVideo } from '../../lib/activitypub/send-request' | ||
44 | 42 | ||
45 | import { addMethodsToModel, getSort } from '../utils' | 43 | import { addMethodsToModel, getSort } from '../utils' |
46 | 44 | ||
47 | import { TagInstance } from './tag-interface' | 45 | import { TagInstance } from './tag-interface' |
48 | import { VideoFileInstance, VideoFileModel } from './video-file-interface' | 46 | import { VideoFileInstance, VideoFileModel } from './video-file-interface' |
49 | import { VideoAttributes, VideoInstance, VideoMethods } from './video-interface' | 47 | import { VideoAttributes, VideoInstance, VideoMethods } from './video-interface' |
48 | import { sendDeleteVideo } from '../../lib/index' | ||
50 | 49 | ||
51 | const Buffer = safeBuffer.Buffer | 50 | const Buffer = safeBuffer.Buffer |
52 | 51 | ||
@@ -584,7 +583,7 @@ toActivityPubObject = function (this: VideoInstance) { | |||
584 | 583 | ||
585 | const videoObject: VideoTorrentObject = { | 584 | const videoObject: VideoTorrentObject = { |
586 | type: 'Video' as 'Video', | 585 | type: 'Video' as 'Video', |
587 | id: getActivityPubUrl('video', this.uuid), | 586 | id: this.url, |
588 | name: this.name, | 587 | name: this.name, |
589 | // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration | 588 | // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration |
590 | duration: 'PT' + this.duration + 'S', | 589 | duration: 'PT' + this.duration + 'S', |
@@ -615,7 +614,7 @@ toActivityPubObject = function (this: VideoInstance) { | |||
615 | width: THUMBNAILS_SIZE.width, | 614 | width: THUMBNAILS_SIZE.width, |
616 | height: THUMBNAILS_SIZE.height | 615 | height: THUMBNAILS_SIZE.height |
617 | }, | 616 | }, |
618 | url | 617 | url // FIXME: needed? |
619 | } | 618 | } |
620 | 619 | ||
621 | return videoObject | 620 | return videoObject |