Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / send / send-view.ts

diff --git a/server/lib/activitypub/send/send-view.ts b/server/lib/activitypub/send/send-view.ts
index 8ad126be05f2eba0cf7ebbe02cec62fba0152bda..153e942959160f4b536527d149e03b15a16b5f97 100644 (file)
--- a/server/lib/activitypub/send/send-view.ts
+++ b/server/lib/activitypub/send/send-view.ts
@@ -1,25 +1,25 @@
 import { Transaction } from 'sequelize'
+import { MActorAudience, MVideoImmutable, MVideoUrl } from '@server/types/models'
 import { ActivityAudience, ActivityView } from '../../../../shared/models/activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { VideoModel } from '../../../models/video/video'
-import { getVideoLikeActivityPubUrl } from '../url'
-import { sendVideoRelatedActivity } from './utils'
-import { audiencify, getAudience } from '../audience'
 import { logger } from '../../../helpers/logger'
+import { ActorModel } from '../../../models/actor/actor'
+import { audiencify, getAudience } from '../audience'
+import { getLocalVideoViewActivityPubUrl } from '../url'
+import { sendVideoRelatedActivity } from './utils'
 
-async function sendView (byActor: ActorModel, video: VideoModel, t: Transaction) {
+async function sendView (byActor: ActorModel, video: MVideoImmutable, t: Transaction) {
   logger.info('Creating job to send view of %s.', video.url)
 
   const activityBuilder = (audience: ActivityAudience) => {
-    const url = getVideoLikeActivityPubUrl(byActor, video)
+    const url = getLocalVideoViewActivityPubUrl(byActor, video)
 
     return buildViewActivity(url, byActor, video, audience)
   }
 
-  return sendVideoRelatedActivity(activityBuilder, { byActor, video, transaction: t })
+  return sendVideoRelatedActivity(activityBuilder, { byActor, video, transaction: t, contextType: 'View' })
 }
 
-function buildViewActivity (url: string, byActor: ActorModel, video: VideoModel, audience?: ActivityAudience): ActivityView {
+function buildViewActivity (url: string, byActor: MActorAudience, video: MVideoUrl, audience?: ActivityAudience): ActivityView {
   if (!audience) audience = getAudience(byActor)
 
   return audiencify(