-import { database as db } from '../../../initializers/index'
-import { AccountInstance } from '../../../models/account/account-interface'
-import { VideoInstance } from '../../../models/index'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
-import { getOrCreateAccountAndServer } from '../account'
-import { forwardActivity } from '../send/misc'
-import { processAddActivity } from './process-add'
-import { processCreateActivity } from './process-create'
-
-async function processAnnounceActivity (activity: ActivityAnnounce) {
- const announcedActivity = activity.object
- const accountAnnouncer = await getOrCreateAccountAndServer(activity.actor)
-
- if (announcedActivity.type === 'Create' && announcedActivity.object.type === 'VideoChannel') {
- return processVideoChannelShare(accountAnnouncer, activity)
- } else if (announcedActivity.type === 'Add' && announcedActivity.object.type === 'Video') {
- return processVideoShare(accountAnnouncer, activity)
- }
-
- logger.warn(
- 'Unknown activity object type %s -> %s when announcing activity.', announcedActivity.type, announcedActivity.object.type,
- { activity: activity.id }
- )
-
- return undefined
+import { sequelizeTypescript } from '../../../initializers/database'
+import { VideoShareModel } from '../../../models/video/video-share'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorSignature, MVideoAccountLightBlacklistAllFiles } from '../../../types/models'
+import { Notifier } from '../../notifier'
+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)