+import { map } from 'bluebird'
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 { 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 { MCommentOwner, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../types/models/video'
+import { getOrCreateAPActor } from './actors'
+import { checkUrlsSameHost } from './url'
+import { getOrCreateAPVideo } from './videos'
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 }>
async function addVideoComments (commentUrls: string[]) {
- return Bluebird.map(commentUrls, commentUrl => {
- return resolveThread({ url: commentUrl, isVideo: false })
+ return 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 })
}
async function resolveThread (params: ResolveThreadParams): ResolveThreadResult {
const { url, isVideo } = params
+
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, try to get the thread from DB
+ 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 tryToResolveThreadFromVideo(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 {
const { url, comments, commentCreated } = params
const commentFromDatabase = await VideoCommentModel.loadByUrlAndPopulateReplyAndVideoUrlAndAccount(url)
- if (commentFromDatabase) {
- let parentComments = comments.concat([ commentFromDatabase ])
+ if (!commentFromDatabase) return undefined
- // Speed up things and resolve directly the thread
- if (commentFromDatabase.InReplyToVideoComment) {
- const data = await VideoCommentModel.listThreadParentComments(commentFromDatabase, undefined, 'DESC')
+ let parentComments = comments.concat([ commentFromDatabase ])
- parentComments = parentComments.concat(data)
- }
+ // Speed up things and resolve directly the thread
+ if (commentFromDatabase.InReplyToVideoComment) {
+ const data = await VideoCommentModel.listThreadParentComments(commentFromDatabase, undefined, 'DESC')
- return resolveThread({
- url: commentFromDatabase.Video.url,
- comments: parentComments,
- isVideo: true,
- commentCreated
- })
+ parentComments = parentComments.concat(data)
}
- return undefined
+ return resolveThread({
+ url: commentFromDatabase.Video.url,
+ comments: parentComments,
+ isVideo: true,
+ commentCreated
+ })
}
-async function tryResolveThreadFromVideo (params: ResolveThreadParams) {
+async function tryToResolveThreadFromVideo (params: ResolveThreadParams) {
const { url, comments, commentCreated } = params
// 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 syncParam = { rates: true, shares: true, comments: false, thumbnail: true, refreshVideo: false }
+ 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) {
- 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
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
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
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 getOrCreateAPActor(actorUrl, 'all')
+ : null
+
const comment = new VideoCommentModel({
url: body.id,
text: body.content ? body.content : '',
projects / github / Chocobozzz / PeerTube.git / blobdiff