import { ActivityAnnounce } from '../../../../shared/models/activitypub'
-import { logger, retryTransactionWrapper } from '../../../helpers'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger } from '../../../helpers/logger'
import { sequelizeTypescript } from '../../../initializers'
import { ActorModel } from '../../../models/activitypub/actor'
import { VideoModel } from '../../../models/video/video'
import { VideoShareModel } from '../../../models/video/video-share'
import { getOrCreateActorAndServerAndModel } from '../actor'
import { forwardActivity } from '../send/misc'
+import { getOrCreateAccountAndVideoAndChannel } from '../videos'
import { processCreateActivity } from './process-create'
async function processAnnounceActivity (activity: ActivityAnnounce) {
const announcedActivity = activity.object
const actorAnnouncer = await getOrCreateActorAndServerAndModel(activity.actor)
- if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'Video') {
+ if (typeof announcedActivity === 'string') {
+ return processVideoShare(actorAnnouncer, activity)
+ } else if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'Video') {
return processVideoShare(actorAnnouncer, activity)
}
function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
const options = {
arguments: [ actorAnnouncer, activity ],
- errorMessage: 'Cannot share the video with many retries.'
+ errorMessage: 'Cannot share the video activity with many retries.'
}
return retryTransactionWrapper(shareVideo, options)
}
-function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
- const announcedActivity = activity.object
+async function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
+ const announced = activity.object
+ let video: VideoModel
+
+ if (typeof announced === 'string') {
+ const res = await getOrCreateAccountAndVideoAndChannel(announced)
+ video = res.video
+ } else {
+ video = await processCreateActivity(announced)
+ }
return sequelizeTypescript.transaction(async t => {
// Add share entry
- const video: VideoModel = await processCreateActivity(announcedActivity)
const share = {
actorId: actorAnnouncer.id,