X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-comment.ts;h=02f160fe833f0970932462b9b7466551f55900d1;hb=ff91b644fb1b063d0a8eff7492beb1a9bf7e4ce1;hp=516c912a90a30f0f3e679e65e37384ee6a3c3542;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/video-comment.ts b/server/lib/video-comment.ts
index 516c912a9..02f160fe8 100644
--- a/server/lib/video-comment.ts
+++ b/server/lib/video-comment.ts
@@ -1,10 +1,33 @@
+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 { getVideoCommentActivityPubUrl } from './activitypub/url'
-import { sendCreateVideoComment } from './activitypub/send'
-import { MAccountDefault, MComment, MCommentOwnerVideoReply, MVideoFullLight } from '../typings/models'
+import { MAccountDefault, MComment, MCommentOwnerVideo, MCommentOwnerVideoReply, MVideoFullLight } from '../types/models'
+import { sendCreateVideoComment, sendDeleteVideoComment } from './activitypub/send'
+import { getLocalVideoCommentActivityPubUrl } from './activitypub/url'
+import { Hooks } from './plugins/hooks'
+
+async function removeComment (videoCommentInstance: MCommentOwnerVideo, req: express.Request, res: express.Response) {
+  const videoCommentInstanceBefore = cloneDeep(videoCommentInstance)
+
+  await sequelizeTypescript.transaction(async t => {
+    if (videoCommentInstance.isOwned() || videoCommentInstance.Video.isOwned()) {
+      await sendDeleteVideoComment(videoCommentInstance, t)
+    }
+
+    videoCommentInstance.markAsDeleted()
+
+    await videoCommentInstance.save({ transaction: t })
+  })
+
+  logger.info('Video comment %d deleted.', videoCommentInstance.id)
+
+  Hooks.runAction('action:api.video-comment.deleted', { comment: videoCommentInstanceBefore, req, res })
+}
 
 async function createVideoComment (obj: {
   text: string
@@ -29,7 +52,7 @@ 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
@@ -73,16 +96,10 @@ function buildFormattedCommentTree (resultList: ResultList<VideoCommentModel>):
   return thread
 }
 
-function markCommentAsDeleted (comment: MCommentOwnerVideoReply): void {
-  comment.text = ''
-  comment.deletedAt = new Date()
-  comment.accountId = null
-}
-
 // ---------------------------------------------------------------------------
 
 export {
+  removeComment,
   createVideoComment,
-  buildFormattedCommentTree,
-  markCommentAsDeleted
+  buildFormattedCommentTree
 }