X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideo-comments.ts;h=722147b69e15a4cea081c7f7b52ca17fc6e86ffb;hb=9777fe9eebe53debdf45091cab98f72a5987e05a;hp=8642d2432df8083afe5e6fce977a8e9d71e701ef;hpb=818c449b3c34e9f324ac744120c8774e724ab25e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/video-comments.ts b/server/lib/activitypub/video-comments.ts
index 8642d2432..722147b69 100644
--- a/server/lib/activitypub/video-comments.ts
+++ b/server/lib/activitypub/video-comments.ts
@@ -1,13 +1,13 @@
+import * as Bluebird from 'bluebird'
+import { checkUrlsSameHost } from '../../helpers/activitypub'
 import { sanitizeAndCheckVideoCommentObject } from '../../helpers/custom-validators/activitypub/video-comments'
 import { logger } from '../../helpers/logger'
-import { doRequest } from '../../helpers/requests'
+import { doJSONRequest } from '../../helpers/requests'
 import { ACTIVITY_PUB, CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants'
 import { VideoCommentModel } from '../../models/video/video-comment'
+import { MCommentOwner, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../types/models/video'
 import { getOrCreateActorAndServerAndModel } from './actor'
-import { getOrCreateVideoAndAccountAndChannel } from './videos'
-import * as Bluebird from 'bluebird'
-import { checkUrlsSameHost } from '../../helpers/activitypub'
-import { MCommentOwner, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../typings/models/video'
+import { getOrCreateAPVideo } from './videos'
 
 type ResolveThreadParams = {
   url: string
@@ -18,8 +18,12 @@ type ResolveThreadParams = {
 type ResolveThreadResult = Promise<{ video: MVideoAccountLightBlacklistAllFiles, comment: MCommentOwnerVideo, commentCreated: boolean }>
 
 async function addVideoComments (commentUrls: string[]) {
-  return Bluebird.map(commentUrls, commentUrl => {
-    return resolveThread({ url: commentUrl, isVideo: false })
+  return Bluebird.map(commentUrls, async commentUrl => {
+    try {
+      await resolveThread({ url: commentUrl, isVideo: false })
+    } catch (err) {
+      logger.warn('Cannot resolve thread %s.', commentUrl, { err })
+    }
   }, { concurrency: CRAWL_REQUEST_CONCURRENCY })
 }
 
@@ -28,21 +32,23 @@ async function resolveThread (params: ResolveThreadParams): ResolveThreadResult
   if (params.commentCreated === undefined) params.commentCreated = false
   if (params.comments === undefined) params.comments = []
 
-  // Already have this comment?
-  if (isVideo !== true) {
+  // If it is not a video, or if we don't know if it's a video
+  if (isVideo === false || isVideo === undefined) {
     const result = await resolveCommentFromDB(params)
     if (result) return result
   }
 
   try {
-    if (isVideo !== false) return await tryResolveThreadFromVideo(params)
-
-    return resolveParentComment(params)
+    // If it is a video, or if we don't know if it's a video
+    if (isVideo === true || isVideo === undefined) {
+      // Keep await so we catch the exception
+      return await tryResolveThreadFromVideo(params)
+    }
   } catch (err) {
-    logger.debug('Cannot get or create account and video and channel for reply %s, fetch comment', url, { err })
-
-    return resolveParentComment(params)
+    logger.debug('Cannot resolve thread from video %s, maybe because it was not a video', url, { err })
   }
+
+  return resolveRemoteParentComment(params)
 }
 
 export {
@@ -83,7 +89,11 @@ async function tryResolveThreadFromVideo (params: ResolveThreadParams) {
   // Maybe it's a reply to a video?
   // If yes, it's done: we resolved all the thread
   const syncParam = { likes: true, dislikes: true, shares: true, comments: false, thumbnail: true, refreshVideo: false }
-  const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: url, syncParam })
+  const { video } = await getOrCreateAPVideo({ videoObject: url, syncParam })
+
+  if (video.isOwned() && !video.hasPrivacyForFederation()) {
+    throw new Error('Cannot resolve thread of video with privacy that is not compatible with federation')
+  }
 
   let resultComment: MCommentOwnerVideo
   if (comments.length !== 0) {
@@ -113,21 +123,17 @@ async function tryResolveThreadFromVideo (params: ResolveThreadParams) {
   return { video, comment: resultComment, commentCreated }
 }
 
-async function resolveParentComment (params: ResolveThreadParams) {
+async function resolveRemoteParentComment (params: ResolveThreadParams) {
   const { url, comments } = params
 
   if (comments.length > ACTIVITY_PUB.MAX_RECURSION_COMMENTS) {
     throw new Error('Recursion limit reached when resolving a thread')
   }
 
-  const { body } = await doRequest({
-    uri: url,
-    json: true,
-    activityPub: true
-  })
+  const { body } = await doJSONRequest<any>(url, { activityPub: true })
 
   if (sanitizeAndCheckVideoCommentObject(body) === false) {
-    throw new Error('Remote video comment JSON is not valid:' + JSON.stringify(body))
+    throw new Error(`Remote video comment JSON ${url} is not valid:` + JSON.stringify(body))
   }
 
   const actorUrl = body.attributedTo