X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-view.ts;h=0a0231a3afb46e870559e747daae096e365df0a9;hb=28dfb44b145c537aba07ae73cb1287f25532022a;hp=b3b6c933dd9e5b1400d1e8049dd0014d5403298f;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-view.ts b/server/lib/activitypub/process/process-view.ts
index b3b6c933d..0a0231a3a 100644
--- a/server/lib/activitypub/process/process-view.ts
+++ b/server/lib/activitypub/process/process-view.ts
@@ -1,9 +1,10 @@
-import { getOrCreateVideoAndAccountAndChannel } from '../videos'
+import { getOrCreateAPVideo } from '../videos'
 import { forwardVideoRelatedActivity } from '../send/utils'
 import { Redis } from '../../redis'
 import { ActivityCreate, ActivityView, ViewObject } from '../../../../shared/models/activitypub'
-import { APProcessorOptions } from '../../../typings/activitypub-processor.model'
-import { MActorSignature } from '../../../typings/models'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import { MActorSignature } from '../../../types/models'
+import { LiveManager } from '@server/lib/live-manager'
 
 async function processViewActivity (options: APProcessorOptions<ActivityCreate | ActivityView>) {
   const { activity, byActor } = options
@@ -19,19 +20,28 @@ export {
 // ---------------------------------------------------------------------------
 
 async function processCreateView (activity: ActivityView | ActivityCreate, byActor: MActorSignature) {
-  const videoObject = activity.type === 'View' ? activity.object : (activity.object as ViewObject).object
+  const videoObject = activity.type === 'View'
+    ? activity.object
+    : (activity.object as ViewObject).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
+  })
 
-  await Redis.Instance.addVideoView(video.id)
+  if (!video.isLive) {
+    await Redis.Instance.addVideoView(video.id)
+  }
 
   if (video.isOwned()) {
-    // Don't resend the activity to the sender
+    // Our live manager will increment the counter and send the view to followers
+    if (video.isLive) {
+      LiveManager.Instance.addViewTo(video.id)
+      return
+    }
+
+    // Forward the view but don't resend the activity to the sender
     const exceptions = [ byActor ]
     await forwardVideoRelatedActivity(activity, undefined, exceptions, video)
   }