X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideo-comments.ts;h=8642d2432df8083afe5e6fce977a8e9d71e701ef;hb=7cd1b12c19d0589d1d692ed0571ca0800f028aea;hp=1a15842cf6e62d7b44ccf07ced0a4024e4ecb218;hpb=b5206dfc455c119b0dcb897bd7144be6ea4d999d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/video-comments.ts b/server/lib/activitypub/video-comments.ts index 1a15842cf..8642d2432 100644 --- a/server/lib/activitypub/video-comments.ts +++ b/server/lib/activitypub/video-comments.ts @@ -10,9 +10,9 @@ import { checkUrlsSameHost } from '../../helpers/activitypub' import { MCommentOwner, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../typings/models/video' type ResolveThreadParams = { - url: string, - comments?: MCommentOwner[], - isVideo?: boolean, + url: string + comments?: MCommentOwner[] + isVideo?: boolean commentCreated?: boolean } type ResolveThreadResult = Promise<{ video: MVideoAccountLightBlacklistAllFiles, comment: MCommentOwnerVideo, commentCreated: boolean }> @@ -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 @@ -87,7 +87,7 @@ async function tryResolveThreadFromVideo (params: ResolveThreadParams) { let resultComment: MCommentOwnerVideo if (comments.length !== 0) { - const firstReply = comments[ comments.length - 1 ] as MCommentOwnerVideo + 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 ] as MCommentOwnerVideo + 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 @@ -141,7 +141,10 @@ async function resolveParentComment (params: ResolveThreadParams) { throw new Error(`Comment url ${url} host is different from the AP object id ${body.id}`) } - const actor = actorUrl ? await getOrCreateActorAndServerAndModel(actorUrl, 'all') : null + const actor = actorUrl + ? await getOrCreateActorAndServerAndModel(actorUrl, 'all') + : null + const comment = new VideoCommentModel({ url: body.id, text: body.content ? body.content : '',