+import { getAPId } from '@server/lib/activitypub/activity'
import { ActivityAnnounce } from '../../../../shared/models/activitypub'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { sequelizeTypescript } from '../../../initializers'
+import { logger } from '../../../helpers/logger'
+import { sequelizeTypescript } from '../../../initializers/database'
import { VideoShareModel } from '../../../models/video/video-share'
-import { forwardVideoRelatedActivity } from '../send/utils'
-import { getOrCreateVideoAndAccountAndChannel } from '../videos'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorSignature, MVideoAccountLightBlacklistAllFiles } from '../../../types/models'
import { Notifier } from '../../notifier'
-import { VideoModel } from '../../../models/video/video'
-import { logger } from '../../../helpers/logger'
-import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
-import { SignatureActorModel } from '../../../typings/models'
+import { forwardVideoRelatedActivity } from '../send/shared/send-utils'
+import { getOrCreateAPVideo } from '../videos'
async function processAnnounceActivity (options: APProcessorOptions<ActivityAnnounce>) {
const { activity, byActor: actorAnnouncer } = options
// Only notify if it is not from a fetcher job
const notify = options.fromFetch !== true
+ // Announces on accounts are not supported
+ if (actorAnnouncer.type !== 'Application' && actorAnnouncer.type !== 'Group') return
+
return retryTransactionWrapper(processVideoShare, actorAnnouncer, activity, notify)
}
// ---------------------------------------------------------------------------
-async function processVideoShare (actorAnnouncer: SignatureActorModel, activity: ActivityAnnounce, notify: boolean) {
- const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id
+async function processVideoShare (actorAnnouncer: MActorSignature, activity: ActivityAnnounce, notify: boolean) {
+ const objectUri = getAPId(activity.object)
- let video: VideoModel
+ let video: MVideoAccountLightBlacklistAllFiles
let videoCreated: boolean
try {
- const result = await getOrCreateVideoAndAccountAndChannel({ videoObject: objectUri })
+ const result = await getOrCreateAPVideo({ videoObject: objectUri })
video = result.video
videoCreated = result.created
} catch (err) {