Add ability to cleanup remote AP interactions

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / video-comments.ts

diff --git a/server/lib/activitypub/video-comments.ts b/server/lib/activitypub/video-comments.ts
index 902d877c466dc0b61d5382ed8ddbe083b01f12bf..d025ed7f12eb348bec081647b68894a1fd164525 100644 (file)
--- a/server/lib/activitypub/video-comments.ts
+++ b/server/lib/activitypub/video-comments.ts
@@ -41,10 +41,10 @@ async function resolveThread (params: ResolveThreadParams): ResolveThreadResult
       return await tryResolveThreadFromVideo(params)
     }
   } catch (err) {
-    logger.debug('Cannot get or create account and video and channel for reply %s, fetch comment', url, { err })
+    logger.debug('Cannot resolve thread from video %s, maybe because it was not a video', url, { err })
   }
 
-  return resolveParentComment(params)
+  return resolveRemoteParentComment(params)
 }
 
 export {
@@ -119,7 +119,7 @@ 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) {
@@ -133,7 +133,7 @@ async function resolveParentComment (params: ResolveThreadParams) {
   })
 
   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