aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/activitypub/process/process-add.ts
diff options
context:
space:
mode:
Diffstat (limited to 'server/lib/activitypub/process/process-add.ts')
-rw-r--r--server/lib/activitypub/process/process-add.ts17
1 files changed, 9 insertions, 8 deletions
diff --git a/server/lib/activitypub/process/process-add.ts b/server/lib/activitypub/process/process-add.ts
index f064c1ab6..281036228 100644
--- a/server/lib/activitypub/process/process-add.ts
+++ b/server/lib/activitypub/process/process-add.ts
@@ -1,11 +1,14 @@
1import * as Bluebird from 'bluebird' 1import * as Bluebird from 'bluebird'
2import { VideoTorrentObject } from '../../../../shared' 2import { VideoTorrentObject } from '../../../../shared'
3import { ActivityAdd } from '../../../../shared/models/activitypub/activity' 3import { ActivityAdd } from '../../../../shared/models/activitypub/activity'
4import { generateThumbnailFromUrl, getOrCreateAccount, logger, retryTransactionWrapper } from '../../../helpers' 4import { retryTransactionWrapper } from '../../../helpers/database-utils'
5import { getOrCreateVideoChannel } from '../../../helpers/activitypub' 5import { logger } from '../../../helpers/logger'
6import { database as db } from '../../../initializers' 6import { database as db } from '../../../initializers'
7import { AccountInstance } from '../../../models/account/account-interface' 7import { AccountInstance } from '../../../models/account/account-interface'
8import { VideoChannelInstance } from '../../../models/video/video-channel-interface' 8import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
9import { getOrCreateAccount } from '../account'
10import { getOrCreateVideoChannel } from '../video-channels'
11import { generateThumbnailFromUrl } from '../videos'
9import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc' 12import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc'
10 13
11async function processAddActivity (activity: ActivityAdd) { 14async function processAddActivity (activity: ActivityAdd) {
@@ -41,12 +44,10 @@ function processAddVideo (account: AccountInstance, activity: ActivityAdd, video
41 return retryTransactionWrapper(addRemoteVideo, options) 44 return retryTransactionWrapper(addRemoteVideo, options)
42} 45}
43 46
44function addRemoteVideo ( 47function addRemoteVideo (account: AccountInstance,
45 account: AccountInstance, 48 activity: ActivityAdd,
46 activity: ActivityAdd, 49 videoChannel: VideoChannelInstance,
47 videoChannel: VideoChannelInstance, 50 videoToCreateData: VideoTorrentObject) {
48 videoToCreateData: VideoTorrentObject
49) {
50 logger.debug('Adding remote video %s.', videoToCreateData.url) 51 logger.debug('Adding remote video %s.', videoToCreateData.url)
51 52
52 return db.sequelize.transaction(async t => { 53 return db.sequelize.transaction(async t => {