import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
import { sequelizeTypescript } from '../../../initializers'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { addVideoComment, resolveThread } from '../video-comments'
+import { resolveThread } from '../video-comments'
import { getOrCreateVideoAndAccountAndChannel } from '../videos'
import { forwardVideoRelatedActivity } from '../send/utils'
import { createOrUpdateCacheFile } from '../cache-file'
import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
import { createOrUpdateVideoPlaylist } from '../playlist'
import { VideoModel } from '../../../models/video/video'
+import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
+import { VideoCommentModel } from '../../../models/video/video-comment'
+import { SignatureActorModel } from '../../../typings/models'
-async function processCreateActivity (activity: ActivityCreate, byActor: ActorModel) {
+async function processCreateActivity (options: APProcessorOptions<ActivityCreate>) {
+ const { activity, byActor } = options
+
+ // Only notify if it is not from a fetcher job
+ const notify = options.fromFetch !== true
const activityObject = activity.object
const activityType = activityObject.type
if (activityType === 'Video') {
- return processCreateVideo(activity)
+ return processCreateVideo(activity, notify)
}
if (activityType === 'Note') {
- return retryTransactionWrapper(processCreateVideoComment, activity, byActor)
+ return retryTransactionWrapper(processCreateVideoComment, activity, byActor, notify)
}
if (activityType === 'CacheFile') {
// ---------------------------------------------------------------------------
-async function processCreateVideo (activity: ActivityCreate) {
+async function processCreateVideo (activity: ActivityCreate, notify: boolean) {
const videoToCreateData = activity.object as VideoTorrentObject
const { video, created } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoToCreateData })
- if (created) Notifier.Instance.notifyOnNewVideoIfNeeded(video)
+ if (created && notify) Notifier.Instance.notifyOnNewVideoIfNeeded(video)
return video
}
-async function processCreateCacheFile (activity: ActivityCreate, byActor: ActorModel) {
+async function processCreateCacheFile (activity: ActivityCreate, byActor: SignatureActorModel) {
const cacheFile = activity.object as CacheFileObject
const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFile.object })
}
}
-async function processCreateVideoComment (activity: ActivityCreate, byActor: ActorModel) {
+async function processCreateVideoComment (activity: ActivityCreate, byActor: SignatureActorModel, notify: boolean) {
const commentObject = activity.object as VideoCommentObject
const byAccount = byActor.Account
if (!byAccount) throw new Error('Cannot create video comment with the non account actor ' + byActor.url)
let video: VideoModel
+ let created: boolean
+ let comment: VideoCommentModel
try {
- const resolveThreadResult = await resolveThread(commentObject.inReplyTo)
+ const resolveThreadResult = await resolveThread({ url: commentObject.id, isVideo: false })
video = resolveThreadResult.video
+ created = resolveThreadResult.commentCreated
+ comment = resolveThreadResult.comment
} catch (err) {
logger.debug(
'Cannot process video comment because we could not resolve thread %s. Maybe it was not a video thread, so skip it.',
return
}
- const { comment, created } = await addVideoComment(video, commentObject.id)
-
if (video.isOwned() && created === true) {
// Don't resend the activity to the sender
const exceptions = [ byActor ]
await forwardVideoRelatedActivity(activity, undefined, exceptions, video)
}
- if (created === true) Notifier.Instance.notifyOnNewComment(comment)
+ if (created && notify) Notifier.Instance.notifyOnNewComment(comment)
}
-async function processCreatePlaylist (activity: ActivityCreate, byActor: ActorModel) {
+async function processCreatePlaylist (activity: ActivityCreate, byActor: SignatureActorModel) {
const playlistObject = activity.object as PlaylistObject
const byAccount = byActor.Account