-import * as Bluebird from 'bluebird'
-import { checkUrlsSameHost } from '../../helpers/activitypub'
+import { map } from 'bluebird'
import { sanitizeAndCheckVideoCommentObject } from '../../helpers/custom-validators/activitypub/video-comments'
import { logger } from '../../helpers/logger'
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 { MComment, MCommentOwner, MCommentOwnerVideo, MVideoAccountLightBlacklistAllFiles } from '../../types/models/video'
+import { isRemoteVideoCommentAccepted } from '../moderation'
+import { Hooks } from '../plugins/hooks'
import { getOrCreateAPActor } from './actors'
+import { checkUrlsSameHost } from './url'
import { getOrCreateAPVideo } from './videos'
type ResolveThreadParams = {
type ResolveThreadResult = Promise<{ video: MVideoAccountLightBlacklistAllFiles, comment: MCommentOwnerVideo, commentCreated: boolean }>
async function addVideoComments (commentUrls: string[]) {
- return Bluebird.map(commentUrls, async commentUrl => {
+ return map(commentUrls, async commentUrl => {
try {
await resolveThread({ url: commentUrl, isVideo: false })
} catch (err) {
// 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 syncParam = { rates: true, shares: true, comments: false, thumbnail: true, refreshVideo: false }
const { video } = await getOrCreateAPVideo({ videoObject: url, syncParam })
if (video.isOwned() && !video.hasPrivacyForFederation()) {
firstReply.changed('updatedAt', true)
firstReply.Video = video
+ if (await isRemoteCommentAccepted(firstReply) !== true) {
+ return undefined
+ }
+
comments[comments.length - 1] = await firstReply.save()
for (let i = comments.length - 2; i >= 0; i--) {
comment.changed('updatedAt', true)
comment.Video = video
+ if (await isRemoteCommentAccepted(comment) !== true) {
+ return undefined
+ }
+
comments[i] = await comment.save()
}
commentCreated: true
})
}
+
+async function isRemoteCommentAccepted (comment: MComment) {
+ // Already created
+ if (comment.id) return true
+
+ const acceptParameters = {
+ comment
+ }
+
+ const acceptedResult = await Hooks.wrapFun(
+ isRemoteVideoCommentAccepted,
+ acceptParameters,
+ 'filter:activity-pub.remote-video-comment.create.accept.result'
+ )
+
+ if (!acceptedResult || acceptedResult.accepted !== true) {
+ logger.info('Refused to create a remote comment.', { acceptedResult, acceptParameters })
+
+ return false
+ }
+
+ return true
+}