2 files changed, 4 insertions, 2 deletions

diff --git a/server/models/abuse/abuse.ts b/server/models/abuse/abuse.ts
index dffd503b3..bd96cf79c 100644
--- a/server/models/abuse/abuse.ts
+++ b/server/models/abuse/abuse.ts
@@ -140,7 +140,7 @@ export enum ScopeNames {
               model: VideoModel.unscoped(),
               include: [
                 {
-                  attributes: [ 'filename', 'fileUrl' ],
+                  attributes: [ 'filename', 'fileUrl', 'type' ],
                   model: ThumbnailModel
                 },
                 {
@@ -395,6 +395,8 @@ export class AbuseModel extends Model<AbuseModel> {
 
       comment = {
         id: entity.id,
+        threadId: entity.getThreadId(),
+
         text: entity.text ?? '',
 
         deleted: entity.isDeleted(),
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index fa4d13c3b..75b914b8c 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -655,7 +655,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
       id: this.id,
       url: this.url,
       text: this.text,
-      threadId: this.originCommentId || this.id,
+      threadId: this.getThreadId(),
       inReplyToCommentId: this.inReplyToCommentId || null,
       videoId: this.videoId,
       createdAt: this.createdAt,