+import { isBlockedByServerOrAccount } from '@server/lib/blocklist'
import { isRedundancyAccepted } from '@server/lib/redundancy'
-import { ActivityCreate, CacheFileObject, VideoTorrentObject } from '../../../../shared'
-import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
-import { VideoCommentObject } from '../../../../shared/models/activitypub/objects/video-comment-object'
+import { VideoModel } from '@server/models/video/video'
+import { ActivityCreate, CacheFileObject, PlaylistObject, VideoCommentObject, VideoObject, WatchActionObject } from '@shared/models'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
import { sequelizeTypescript } from '../../../initializers/database'
-import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
-import { MActorSignature, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../../typings/models'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorSignature, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../../types/models'
import { Notifier } from '../../notifier'
import { createOrUpdateCacheFile } from '../cache-file'
-import { createOrUpdateVideoPlaylist } from '../playlist'
-import { forwardVideoRelatedActivity } from '../send/utils'
+import { createOrUpdateLocalVideoViewer } from '../local-video-viewer'
+import { createOrUpdateVideoPlaylist } from '../playlists'
+import { forwardVideoRelatedActivity } from '../send/shared/send-utils'
import { resolveThread } from '../video-comments'
-import { getOrCreateVideoAndAccountAndChannel } from '../videos'
-import { isBlockedByServerOrAccount } from '@server/lib/blocklist'
+import { getOrCreateAPVideo } from '../videos'
async function processCreateActivity (options: APProcessorOptions<ActivityCreate>) {
const { activity, byActor } = options
}
if (activityType === 'Note') {
+ // Comments will be fetched from videos
+ if (options.fromFetch) return
+
return retryTransactionWrapper(processCreateVideoComment, activity, byActor, notify)
}
+ if (activityType === 'WatchAction') {
+ return retryTransactionWrapper(processCreateWatchAction, activity)
+ }
+
if (activityType === 'CacheFile') {
return retryTransactionWrapper(processCreateCacheFile, activity, byActor)
}
// ---------------------------------------------------------------------------
async function processCreateVideo (activity: ActivityCreate, notify: boolean) {
- const videoToCreateData = activity.object as VideoTorrentObject
+ const videoToCreateData = activity.object as VideoObject
- const { video, created } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoToCreateData })
+ const syncParam = { rates: false, shares: false, comments: false, thumbnail: true, refreshVideo: false }
+ const { video, created } = await getOrCreateAPVideo({ videoObject: videoToCreateData, syncParam })
if (created && notify) Notifier.Instance.notifyOnNewVideoIfNeeded(video)
const cacheFile = activity.object as CacheFileObject
- const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFile.object })
+ const { video } = await getOrCreateAPVideo({ videoObject: cacheFile.object })
await sequelizeTypescript.transaction(async t => {
return createOrUpdateCacheFile(cacheFile, video, byActor, t)
}
}
+async function processCreateWatchAction (activity: ActivityCreate) {
+ const watchAction = activity.object as WatchActionObject
+
+ if (watchAction.actionStatus !== 'CompletedActionStatus') return
+
+ const video = await VideoModel.loadByUrl(watchAction.object)
+ if (video.remote) return
+
+ await sequelizeTypescript.transaction(async t => {
+ return createOrUpdateLocalVideoViewer(watchAction, video, t)
+ })
+}
+
async function processCreateVideoComment (activity: ActivityCreate, byActor: MActorSignature, notify: boolean) {
const commentObject = activity.object as VideoCommentObject
const byAccount = byActor.Account
let video: MVideoAccountLightBlacklistAllFiles
let created: boolean
let comment: MCommentOwnerVideo
+
try {
const resolveThreadResult = await resolveThread({ url: commentObject.id, isVideo: false })
+ if (!resolveThreadResult) return // Comment not accepted
+
video = resolveThreadResult.video
created = resolveThreadResult.commentCreated
comment = resolveThreadResult.comment
return
}
- // Try to not forward unwanted commments on our videos
- if (video.isOwned() && await isBlockedByServerOrAccount(comment.Account, video.VideoChannel.Account)) {
- logger.info('Skip comment forward from blocked account or server %s.', comment.Account.Actor.url)
- return
- }
+ // Try to not forward unwanted comments on our videos
+ if (video.isOwned()) {
+ if (await isBlockedByServerOrAccount(comment.Account, video.VideoChannel.Account)) {
+ logger.info('Skip comment forward from blocked account or server %s.', comment.Account.Actor.url)
+ return
+ }
- if (video.isOwned() && created === true) {
- // Don't resend the activity to the sender
- const exceptions = [ byActor ]
+ if (created === true) {
+ // Don't resend the activity to the sender
+ const exceptions = [ byActor ]
- await forwardVideoRelatedActivity(activity, undefined, exceptions, video)
+ await forwardVideoRelatedActivity(activity, undefined, exceptions, video)
+ }
}
if (created && notify) Notifier.Instance.notifyOnNewComment(comment)
if (!byAccount) throw new Error('Cannot create video playlist with the non account actor ' + byActor.url)
- await createOrUpdateVideoPlaylist(playlistObject, byAccount, activity.to)
+ await createOrUpdateVideoPlaylist(playlistObject, activity.to)
}