diff options
Diffstat (limited to 'server/lib/activitypub/misc.ts')
-rw-r--r-- | server/lib/activitypub/misc.ts | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/server/lib/activitypub/misc.ts b/server/lib/activitypub/misc.ts index c07d9f654..4c210eb10 100644 --- a/server/lib/activitypub/misc.ts +++ b/server/lib/activitypub/misc.ts | |||
@@ -2,11 +2,12 @@ import * as magnetUtil from 'magnet-uri' | |||
2 | import { VideoTorrentObject } from '../../../shared' | 2 | import { VideoTorrentObject } from '../../../shared' |
3 | import { VideoChannelObject } from '../../../shared/models/activitypub/objects/video-channel-object' | 3 | import { VideoChannelObject } from '../../../shared/models/activitypub/objects/video-channel-object' |
4 | import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' | 4 | import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' |
5 | import { VIDEO_MIMETYPE_EXT } from '../../initializers/constants' | 5 | import { ACTIVITY_PUB, VIDEO_MIMETYPE_EXT } from '../../initializers/constants' |
6 | import { AccountInstance } from '../../models/account/account-interface' | 6 | import { AccountInstance } from '../../models/account/account-interface' |
7 | import { VideoChannelInstance } from '../../models/video/video-channel-interface' | 7 | import { VideoChannelInstance } from '../../models/video/video-channel-interface' |
8 | import { VideoFileAttributes } from '../../models/video/video-file-interface' | 8 | import { VideoFileAttributes } from '../../models/video/video-file-interface' |
9 | import { VideoAttributes, VideoInstance } from '../../models/video/video-interface' | 9 | import { VideoAttributes, VideoInstance } from '../../models/video/video-interface' |
10 | import { VideoPrivacy } from '../../../shared/models/videos/video-privacy.enum' | ||
10 | 11 | ||
11 | function videoChannelActivityObjectToDBAttributes (videoChannelObject: VideoChannelObject, account: AccountInstance) { | 12 | function videoChannelActivityObjectToDBAttributes (videoChannelObject: VideoChannelObject, account: AccountInstance) { |
12 | return { | 13 | return { |
@@ -23,8 +24,14 @@ function videoChannelActivityObjectToDBAttributes (videoChannelObject: VideoChan | |||
23 | 24 | ||
24 | async function videoActivityObjectToDBAttributes ( | 25 | async function videoActivityObjectToDBAttributes ( |
25 | videoChannel: VideoChannelInstance, | 26 | videoChannel: VideoChannelInstance, |
26 | videoObject: VideoTorrentObject | 27 | videoObject: VideoTorrentObject, |
28 | to: string[] = [], | ||
29 | cc: string[] = [] | ||
27 | ) { | 30 | ) { |
31 | let privacy = VideoPrivacy.PRIVATE | ||
32 | if (to.indexOf(ACTIVITY_PUB.PUBLIC) !== -1) privacy = VideoPrivacy.PUBLIC | ||
33 | else if (cc.indexOf(ACTIVITY_PUB.PUBLIC) !== -1) privacy = VideoPrivacy.UNLISTED | ||
34 | |||
28 | const duration = videoObject.duration.replace(/[^\d]+/, '') | 35 | const duration = videoObject.duration.replace(/[^\d]+/, '') |
29 | const videoData: VideoAttributes = { | 36 | const videoData: VideoAttributes = { |
30 | name: videoObject.name, | 37 | name: videoObject.name, |
@@ -43,11 +50,8 @@ async function videoActivityObjectToDBAttributes ( | |||
43 | views: videoObject.views, | 50 | views: videoObject.views, |
44 | likes: 0, | 51 | likes: 0, |
45 | dislikes: 0, | 52 | dislikes: 0, |
46 | // likes: videoToCreateData.likes, | ||
47 | // dislikes: videoToCreateData.dislikes, | ||
48 | remote: true, | 53 | remote: true, |
49 | privacy: 1 | 54 | privacy |
50 | // privacy: videoToCreateData.privacy | ||
51 | } | 55 | } |
52 | 56 | ||
53 | return videoData | 57 | return videoData |