Fix comment deletion with mastodon

[github/Chocobozzz/PeerTube.git] / server / lib / video-comment.ts

diff --git a/server/lib/video-comment.ts b/server/lib/video-comment.ts
index 0d744c526ee74da49a7cc32cfe104857cc8c9bf3..70ba7c3039cd947c3636d65d64418e80f810d111 100644 (file)
--- a/server/lib/video-comment.ts
+++ b/server/lib/video-comment.ts
@@ -5,18 +5,18 @@ import { AccountModel } from '../models/account/account'
 import { VideoModel } from '../models/video/video'
 import { VideoCommentModel } from '../models/video/video-comment'
 import { getVideoCommentActivityPubUrl } from './activitypub'
-import { sendCreateVideoCommentToOrigin, sendCreateVideoCommentToVideoFollowers } from './activitypub/send'
+import { sendCreateVideoComment } from './activitypub/send'
 
 async function createVideoComment (obj: {
   text: string,
-  inReplyToComment: VideoCommentModel,
+  inReplyToComment: VideoCommentModel | null,
   video: VideoModel
   account: AccountModel
 }, t: Sequelize.Transaction) {
-  let originCommentId: number = null
-  let inReplyToCommentId: number = null
+  let originCommentId: number | null = null
+  let inReplyToCommentId: number | null = null
 
-  if (obj.inReplyToComment) {
+  if (obj.inReplyToComment && obj.inReplyToComment !== null) {
     originCommentId = obj.inReplyToComment.originCommentId || obj.inReplyToComment.id
     inReplyToCommentId = obj.inReplyToComment.id
   }
@@ -37,11 +37,7 @@ async function createVideoComment (obj: {
   savedComment.Video = obj.video
   savedComment.Account = obj.account
 
-  if (savedComment.Video.isOwned()) {
-    await sendCreateVideoCommentToVideoFollowers(savedComment, t)
-  } else {
-    await sendCreateVideoCommentToOrigin(savedComment, t)
-  }
+  await sendCreateVideoComment(savedComment, t)
 
   return savedComment
 }