aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/models/video/video.ts6
-rw-r--r--server/tests/utils/videos/videos.ts2
2 files changed, 6 insertions, 2 deletions
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index f23fac2ab..ea466fccd 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -104,13 +104,13 @@ enum ScopeNames {
104 videoChannelId?: number 104 videoChannelId?: number
105 }) => { 105 }) => {
106 const accountInclude = { 106 const accountInclude = {
107 attributes: [ 'name' ], 107 attributes: [ 'id', 'name' ],
108 model: AccountModel.unscoped(), 108 model: AccountModel.unscoped(),
109 required: true, 109 required: true,
110 where: {}, 110 where: {},
111 include: [ 111 include: [
112 { 112 {
113 attributes: [ 'preferredUsername', 'url', 'serverId', 'avatarId' ], 113 attributes: [ 'id', 'uuid', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
114 model: ActorModel.unscoped(), 114 model: ActorModel.unscoped(),
115 required: true, 115 required: true,
116 where: VideoModel.buildActorWhereWithFilter(options.filter), 116 where: VideoModel.buildActorWhereWithFilter(options.filter),
@@ -1078,6 +1078,8 @@ export class VideoModel extends Model<VideoModel> {
1078 updatedAt: this.updatedAt, 1078 updatedAt: this.updatedAt,
1079 publishedAt: this.publishedAt, 1079 publishedAt: this.publishedAt,
1080 account: { 1080 account: {
1081 id: formattedAccount.id,
1082 uuid: formattedAccount.uuid,
1081 name: formattedAccount.name, 1083 name: formattedAccount.name,
1082 displayName: formattedAccount.displayName, 1084 displayName: formattedAccount.displayName,
1083 url: formattedAccount.url, 1085 url: formattedAccount.url,
diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts
index 2ba3a860b..d1d8c07df 100644
--- a/server/tests/utils/videos/videos.ts
+++ b/server/tests/utils/videos/videos.ts
@@ -486,6 +486,8 @@ async function completeVideoCheck (
486 expect(video.privacy.label).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy]) 486 expect(video.privacy.label).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy])
487 expect(video.nsfw).to.equal(attributes.nsfw) 487 expect(video.nsfw).to.equal(attributes.nsfw)
488 expect(video.description).to.equal(attributes.description) 488 expect(video.description).to.equal(attributes.description)
489 expect(video.account.id).to.be.a('number')
490 expect(video.account.uuid).to.be.a('string')
489 expect(video.account.host).to.equal(attributes.account.host) 491 expect(video.account.host).to.equal(attributes.account.host)
490 expect(video.account.name).to.equal(attributes.account.name) 492 expect(video.account.name).to.equal(attributes.account.name)
491 expect(video.likes).to.equal(attributes.likes) 493 expect(video.likes).to.equal(attributes.likes)