Support short uuid for GET video/playlist

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

diff --git a/server/lib/activitypub/process/process-view.ts b/server/lib/activitypub/process/process-view.ts
index efceb21a207f64ecef6184f40dec2d8e8f807208..5593ee2570b14ba3115437b05d3bf598d806d230 100644 (file)
--- a/server/lib/activitypub/process/process-view.ts
+++ b/server/lib/activitypub/process/process-view.ts
@@ -1,10 +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 '../../../types/activitypub-processor.model'
 import { MActorSignature } from '../../../types/models'
-import { LiveManager } from '@server/lib/live-manager'
+import { LiveManager } from '@server/lib/live/live-manager'
 
 async function processViewActivity (options: APProcessorOptions<ActivityCreate | ActivityView>) {
   const { activity, byActor } = options
@@ -24,12 +24,15 @@ async function processCreateView (activity: ActivityView | ActivityCreate, byAct
     ? activity.object
     : (activity.object as ViewObject).object
 
-  const options = {
+  const { video } = await getOrCreateAPVideo({
     videoObject,
-    fetchType: 'only-video' as 'only-video',
-    allowRefresh: false as false
+    fetchType: 'only-video',
+    allowRefresh: false
+  })
+
+  if (!video.isLive) {
+    await Redis.Instance.addVideoView(video.id)
   }
-  const { video } = await getOrCreateVideoAndAccountAndChannel(options)
 
   if (video.isOwned()) {
     // Our live manager will increment the counter and send the view to followers
@@ -38,8 +41,6 @@ async function processCreateView (activity: ActivityView | ActivityCreate, byAct
       return
     }
 
-    await Redis.Instance.addVideoView(video.id)
-
     // Forward the view but don't resend the activity to the sender
     const exceptions = [ byActor ]
     await forwardVideoRelatedActivity(activity, undefined, exceptions, video)