diff options
Diffstat (limited to 'server/models/account/user.ts')
-rw-r--r-- | server/models/account/user.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 1401762c5..7390baf91 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts | |||
@@ -164,7 +164,7 @@ toFormattedJSON = function (this: UserInstance) { | |||
164 | roleLabel: USER_ROLE_LABELS[this.role], | 164 | roleLabel: USER_ROLE_LABELS[this.role], |
165 | videoQuota: this.videoQuota, | 165 | videoQuota: this.videoQuota, |
166 | createdAt: this.createdAt, | 166 | createdAt: this.createdAt, |
167 | author: { | 167 | account: { |
168 | id: this.Account.id, | 168 | id: this.Account.id, |
169 | uuid: this.Account.uuid | 169 | uuid: this.Account.uuid |
170 | } | 170 | } |
@@ -295,7 +295,7 @@ function getOriginalVideoFileTotalFromUser (user: UserInstance) { | |||
295 | '(SELECT MAX("VideoFiles"."size") AS "size" FROM "VideoFiles" ' + | 295 | '(SELECT MAX("VideoFiles"."size") AS "size" FROM "VideoFiles" ' + |
296 | 'INNER JOIN "Videos" ON "VideoFiles"."videoId" = "Videos"."id" ' + | 296 | 'INNER JOIN "Videos" ON "VideoFiles"."videoId" = "Videos"."id" ' + |
297 | 'INNER JOIN "VideoChannels" ON "VideoChannels"."id" = "Videos"."channelId" ' + | 297 | 'INNER JOIN "VideoChannels" ON "VideoChannels"."id" = "Videos"."channelId" ' + |
298 | 'INNER JOIN "Accounts" ON "VideoChannels"."authorId" = "Accounts"."id" ' + | 298 | 'INNER JOIN "Accounts" ON "VideoChannels"."accountId" = "Accounts"."id" ' + |
299 | 'INNER JOIN "Users" ON "Accounts"."userId" = "Users"."id" ' + | 299 | 'INNER JOIN "Users" ON "Accounts"."userId" = "Users"."id" ' + |
300 | 'WHERE "Users"."id" = $userId GROUP BY "Videos"."id") t' | 300 | 'WHERE "Users"."id" = $userId GROUP BY "Videos"."id") t' |
301 | 301 | ||