aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/models/abuse/abuse.ts4
-rw-r--r--server/models/video/video-comment.ts2
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 {
140 model: VideoModel.unscoped(), 140 model: VideoModel.unscoped(),
141 include: [ 141 include: [
142 { 142 {
143 attributes: [ 'filename', 'fileUrl' ], 143 attributes: [ 'filename', 'fileUrl', 'type' ],
144 model: ThumbnailModel 144 model: ThumbnailModel
145 }, 145 },
146 { 146 {
@@ -395,6 +395,8 @@ export class AbuseModel extends Model<AbuseModel> {
395 395
396 comment = { 396 comment = {
397 id: entity.id, 397 id: entity.id,
398 threadId: entity.getThreadId(),
399
398 text: entity.text ?? '', 400 text: entity.text ?? '',
399 401
400 deleted: entity.isDeleted(), 402 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> {
655 id: this.id, 655 id: this.id,
656 url: this.url, 656 url: this.url,
657 text: this.text, 657 text: this.text,
658 threadId: this.originCommentId || this.id, 658 threadId: this.getThreadId(),
659 inReplyToCommentId: this.inReplyToCommentId || null, 659 inReplyToCommentId: this.inReplyToCommentId || null,
660 videoId: this.videoId, 660 videoId: this.videoId,
661 createdAt: this.createdAt, 661 createdAt: this.createdAt,