-import { ActivityAnnounce, ActivityCreate } from '../../../../shared/models/activitypub'
-import { logger, retryTransactionWrapper } from '../../../helpers'
+import { ActivityAnnounce } from '../../../../shared/models/activitypub'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
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 { processCreateActivity } from './process-create'
+import { forwardVideoRelatedActivity } from '../send/utils'
+import { getOrCreateAccountAndVideoAndChannel } from '../videos'
async function processAnnounceActivity (activity: ActivityAnnounce) {
- const announcedActivity = activity.object
const actorAnnouncer = await getOrCreateActorAndServerAndModel(activity.actor)
- if (typeof announcedActivity === 'string') {
- return processVideoShare(actorAnnouncer, activity)
- } else if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'Video') {
- return processVideoShare(actorAnnouncer, activity)
- }
-
- logger.warn(
- 'Unknown activity object type %s -> %s when announcing activity.', announcedActivity.type, announcedActivity.object.type,
- { activity: activity.id }
- )
-
- return undefined
+ return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity)
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
- const options = {
- arguments: [ actorAnnouncer, activity ],
- errorMessage: 'Cannot share the video activity with many retries.'
- }
-
- return retryTransactionWrapper(shareVideo, options)
-}
+async function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
+ const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id
+ let video: VideoModel
-function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) {
- const announced = activity.object
+ const res = await getOrCreateAccountAndVideoAndChannel(objectUri)
+ video = res.video
return sequelizeTypescript.transaction(async t => {
// Add share entry
- let video: VideoModel
-
- if (typeof announced === 'string') {
- video = await VideoModel.loadByUrlAndPopulateAccount(announced)
- if (!video) throw new Error('Unknown video to share ' + announced)
- } else {
- video = await processCreateActivity(announced)
- }
const share = {
actorId: actorAnnouncer.id,
- videoId: video.id
+ videoId: video.id,
+ url: activity.id
}
const [ , created ] = await VideoShareModel.findOrCreate({
- where: share,
+ where: {
+ url: activity.id
+ },
defaults: share,
transaction: t
})
if (video.isOwned() && created === true) {
// Don't resend the activity to the sender
const exceptions = [ actorAnnouncer ]
- await forwardActivity(activity, t, exceptions)
+
+ await forwardVideoRelatedActivity(activity, t, exceptions, video)
}
return undefined