X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideo-comments.ts;h=8642d2432df8083afe5e6fce977a8e9d71e701ef;hb=7cd1b12c19d0589d1d692ed0571ca0800f028aea;hp=92e1a9020788d570676fa6e1628e5f23b1453219;hpb=6b9c966f6428c9e47bead3410a0401e8ebd744bf;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/video-comments.ts b/server/lib/activitypub/video-comments.ts
index 92e1a9020..8642d2432 100644
--- a/server/lib/activitypub/video-comments.ts
+++ b/server/lib/activitypub/video-comments.ts
@@ -2,20 +2,20 @@ import { sanitizeAndCheckVideoCommentObject } from '../../helpers/custom-validat
 import { logger } from '../../helpers/logger'
 import { doRequest } from '../../helpers/requests'
 import { ACTIVITY_PUB, CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants'
-import { VideoModel } from '../../models/video/video'
 import { VideoCommentModel } from '../../models/video/video-comment'
 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'
 
 type ResolveThreadParams = {
-  url: string,
-  comments?: VideoCommentModel[],
-  isVideo?: boolean,
+  url: string
+  comments?: MCommentOwner[]
+  isVideo?: boolean
   commentCreated?: boolean
 }
-type ResolveThreadResult = Promise<{ video: VideoModel, comment: VideoCommentModel, commentCreated: boolean }>
+type ResolveThreadResult = Promise<{ video: MVideoAccountLightBlacklistAllFiles, comment: MCommentOwnerVideo, commentCreated: boolean }>
 
 async function addVideoComments (commentUrls: string[]) {
   return Bluebird.map(commentUrls, commentUrl => {
@@ -28,7 +28,7 @@ async function resolveThread (params: ResolveThreadParams): ResolveThreadResult
   if (params.commentCreated === undefined) params.commentCreated = false
   if (params.comments === undefined) params.comments = []
 
-   // Already have this comment?
+  // Already have this comment?
   if (isVideo !== true) {
     const result = await resolveCommentFromDB(params)
     if (result) return result
@@ -85,9 +85,9 @@ async function tryResolveThreadFromVideo (params: ResolveThreadParams) {
   const syncParam = { likes: true, dislikes: true, shares: true, comments: false, thumbnail: true, refreshVideo: false }
   const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: url, syncParam })
 
-  let resultComment: VideoCommentModel
+  let resultComment: MCommentOwnerVideo
   if (comments.length !== 0) {
-    const firstReply = comments[ comments.length - 1 ]
+    const firstReply = comments[comments.length - 1] as MCommentOwnerVideo
     firstReply.inReplyToCommentId = null
     firstReply.originCommentId = null
     firstReply.videoId = video.id
@@ -97,9 +97,9 @@ async function tryResolveThreadFromVideo (params: ResolveThreadParams) {
     comments[comments.length - 1] = await firstReply.save()
 
     for (let i = comments.length - 2; i >= 0; i--) {
-      const comment = comments[ i ]
+      const comment = comments[i] as MCommentOwnerVideo
       comment.originCommentId = firstReply.id
-      comment.inReplyToCommentId = comments[ i + 1 ].id
+      comment.inReplyToCommentId = comments[i + 1].id
       comment.videoId = video.id
       comment.changed('updatedAt', true)
       comment.Video = video
@@ -107,7 +107,7 @@ async function tryResolveThreadFromVideo (params: ResolveThreadParams) {
       comments[i] = await comment.save()
     }
 
-    resultComment = comments[0]
+    resultComment = comments[0] as MCommentOwnerVideo
   }
 
   return { video, comment: resultComment, commentCreated }
@@ -131,9 +131,9 @@ async function resolveParentComment (params: ResolveThreadParams) {
   }
 
   const actorUrl = body.attributedTo
-  if (!actorUrl) throw new Error('Miss attributed to in comment')
+  if (!actorUrl && body.type !== 'Tombstone') throw new Error('Miss attributed to in comment')
 
-  if (checkUrlsSameHost(url, actorUrl) !== true) {
+  if (actorUrl && checkUrlsSameHost(url, actorUrl) !== true) {
     throw new Error(`Actor url ${actorUrl} has not the same host than the comment url ${url}`)
   }
 
@@ -141,18 +141,22 @@ async function resolveParentComment (params: ResolveThreadParams) {
     throw new Error(`Comment url ${url} host is different from the AP object id ${body.id}`)
   }
 
-  const actor = await getOrCreateActorAndServerAndModel(actorUrl)
+  const actor = actorUrl
+    ? await getOrCreateActorAndServerAndModel(actorUrl, 'all')
+    : null
+
   const comment = new VideoCommentModel({
     url: body.id,
-    text: body.content,
+    text: body.content ? body.content : '',
     videoId: null,
-    accountId: actor.Account.id,
+    accountId: actor ? actor.Account.id : null,
     inReplyToCommentId: null,
     originCommentId: null,
     createdAt: new Date(body.published),
-    updatedAt: new Date(body.updated)
-  })
-  comment.Account = actor.Account
+    updatedAt: new Date(body.updated),
+    deletedAt: body.deleted ? new Date(body.deleted) : null
+  }) as MCommentOwner
+  comment.Account = actor ? actor.Account : null
 
   return resolveThread({
     url: body.inReplyTo,