diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/video/video-channel.ts | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 8498143fe..b9df14eca 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts | |||
@@ -34,11 +34,11 @@ enum ScopeNames { | |||
34 | [ScopeNames.WITH_ACCOUNT]: { | 34 | [ScopeNames.WITH_ACCOUNT]: { |
35 | include: [ | 35 | include: [ |
36 | { | 36 | { |
37 | model: () => AccountModel, | 37 | model: () => AccountModel.unscoped(), |
38 | required: true, | 38 | required: true, |
39 | include: [ | 39 | include: [ |
40 | { | 40 | { |
41 | model: () => ActorModel, | 41 | model: () => ActorModel.unscoped(), |
42 | required: true | 42 | required: true |
43 | } | 43 | } |
44 | ] | 44 | ] |
@@ -247,12 +247,7 @@ export class VideoChannelModel extends Model<VideoChannelModel> { | |||
247 | videos: undefined | 247 | videos: undefined |
248 | } | 248 | } |
249 | 249 | ||
250 | if (this.Account) { | 250 | if (this.Account) videoChannel.ownerAccount = this.Account.toFormattedJSON() |
251 | videoChannel.ownerAccount = { | ||
252 | id: this.Account.id, | ||
253 | uuid: this.Account.Actor.uuid | ||
254 | } | ||
255 | } | ||
256 | 251 | ||
257 | return Object.assign(actor, videoChannel) | 252 | return Object.assign(actor, videoChannel) |
258 | } | 253 | } |