import { cloneDeep } from 'lodash'
import * as Sequelize from 'sequelize'
+import express from 'express'
import { logger } from '@server/helpers/logger'
import { sequelizeTypescript } from '@server/initializers/database'
import { ResultList } from '../../shared/models'
-import { VideoCommentThreadTree } from '../../shared/models/videos/video-comment.model'
+import { VideoCommentThreadTree } from '../../shared/models/videos/comment/video-comment.model'
import { VideoCommentModel } from '../models/video/video-comment'
-import { MAccountDefault, MComment, MCommentOwnerVideoReply, MVideoFullLight, MCommentOwnerVideo } from '../typings/models'
+import { MAccountDefault, MComment, MCommentOwnerVideo, MCommentOwnerVideoReply, MVideoFullLight } from '../types/models'
import { sendCreateVideoComment, sendDeleteVideoComment } from './activitypub/send'
-import { getVideoCommentActivityPubUrl } from './activitypub/url'
+import { getLocalVideoCommentActivityPubUrl } from './activitypub/url'
import { Hooks } from './plugins/hooks'
-async function removeComment (videoCommentInstance: MCommentOwnerVideo) {
+async function removeComment (videoCommentInstance: MCommentOwnerVideo, req: express.Request, res: express.Response) {
const videoCommentInstanceBefore = cloneDeep(videoCommentInstance)
await sequelizeTypescript.transaction(async t => {
await sendDeleteVideoComment(videoCommentInstance, t)
}
- markCommentAsDeleted(videoCommentInstance)
+ videoCommentInstance.markAsDeleted()
- await videoCommentInstance.save()
+ await videoCommentInstance.save({ transaction: t })
})
logger.info('Video comment %d deleted.', videoCommentInstance.id)
- Hooks.runAction('action:api.video-comment.deleted', { comment: videoCommentInstanceBefore })
+ Hooks.runAction('action:api.video-comment.deleted', { comment: videoCommentInstanceBefore, req, res })
}
async function createVideoComment (obj: {
url: new Date().toISOString()
}, { transaction: t, validate: false })
- comment.url = getVideoCommentActivityPubUrl(obj.video, comment)
+ comment.url = getLocalVideoCommentActivityPubUrl(obj.video, comment)
const savedComment: MCommentOwnerVideoReply = await comment.save({ transaction: t })
savedComment.InReplyToVideoComment = obj.inReplyToComment
return thread
}
-function markCommentAsDeleted (comment: MComment): void {
- comment.text = ''
- comment.deletedAt = new Date()
- comment.accountId = null
-}
-
// ---------------------------------------------------------------------------
export {
removeComment,
createVideoComment,
- buildFormattedCommentTree,
- markCommentAsDeleted
+ buildFormattedCommentTree
}