-import { getOrCreateVideoAndAccountAndChannel } from '../videos'
-import { forwardVideoRelatedActivity } from '../send/utils'
-import { Redis } from '../../redis'
-import { ActivityCreate, ActivityView, ViewObject } from '../../../../shared/models/activitypub'
+import { VideoViewsManager } from '@server/lib/views/video-views-manager'
+import { ActivityView } from '../../../../shared/models/activitypub'
import { APProcessorOptions } from '../../../types/activitypub-processor.model'
import { MActorSignature } from '../../../types/models'
+import { forwardVideoRelatedActivity } from '../send/shared/send-utils'
+import { getOrCreateAPVideo } from '../videos'
-async function processViewActivity (options: APProcessorOptions<ActivityCreate | ActivityView>) {
+async function processViewActivity (options: APProcessorOptions<ActivityView>) {
const { activity, byActor } = options
+
return processCreateView(activity, byActor)
}
// ---------------------------------------------------------------------------
-async function processCreateView (activity: ActivityView | ActivityCreate, byActor: MActorSignature) {
- const videoObject = activity.type === 'View' ? activity.object : (activity.object as ViewObject).object
+async function processCreateView (activity: ActivityView, byActor: MActorSignature) {
+ const videoObject = activity.object
- const options = {
+ const { video } = await getOrCreateAPVideo({
videoObject,
- fetchType: 'only-immutable-attributes' as 'only-immutable-attributes',
- allowRefresh: false as false
- }
- const { video } = await getOrCreateVideoAndAccountAndChannel(options)
+ fetchType: 'only-video',
+ allowRefresh: false
+ })
+
+ const viewerExpires = activity.expires
+ ? new Date(activity.expires)
+ : undefined
- await Redis.Instance.addVideoView(video.id)
+ await VideoViewsManager.Instance.processRemoteView({ video, viewerId: activity.id, viewerExpires })
if (video.isOwned()) {
- // Don't resend the activity to the sender
+ // Forward the view but don't resend the activity to the sender
const exceptions = [ byActor ]
await forwardVideoRelatedActivity(activity, undefined, exceptions, video)
}