Check threads resolve on non federated videos

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

diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index f8f9b80c6d242153e98fa20589ecd0c229401064..9cded4dec00a28a7571ee3e1ce019d0b53a68a8a 100644 (file)
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -1,12 +1,12 @@
 import { isRedundancyAccepted } from '@server/lib/redundancy'
-import { ActivityCreate, CacheFileObject, VideoTorrentObject } from '../../../../shared'
+import { ActivityCreate, CacheFileObject, VideoObject } from '../../../../shared'
 import { PlaylistObject } from '../../../../shared/models/activitypub/objects/playlist-object'
 import { VideoCommentObject } from '../../../../shared/models/activitypub/objects/video-comment-object'
 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'
@@ -52,9 +52,10 @@ export {
 // ---------------------------------------------------------------------------
 
 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 = { likes: false, dislikes: false, shares: false, comments: false, thumbnail: true, refreshVideo: false }
+  const { video, created } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoToCreateData, syncParam })
 
   if (created && notify) Notifier.Instance.notifyOnNewVideoIfNeeded(video)
 
@@ -90,6 +91,7 @@ async function processCreateVideoComment (activity: ActivityCreate, byActor: MAc
   let comment: MCommentOwnerVideo
   try {
     const resolveThreadResult = await resolveThread({ url: commentObject.id, isVideo: false })
+
     video = resolveThreadResult.video
     created = resolveThreadResult.commentCreated
     comment = resolveThreadResult.comment
@@ -103,16 +105,18 @@ async function processCreateVideoComment (activity: ActivityCreate, byActor: MAc
   }
 
   // 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
-  }
+  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)