diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-03-07 10:42:31 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-03-07 10:42:31 +0100 |
| commit | d9dbf27a7dacb42e49e21d5691141c2edf885644 (patch) | |
| tree | 5f33a1125099b14f94d61091061d8b754a1e4784 /server/models/user | |
| parent | 692ae8c31caa5a404142c9f46e03fdc8dc5b233f (diff) | |
| parent | a3e5f7e732cca41267314d64307bdcfebd12e7de (diff) | |
| download | PeerTube-d9dbf27a7dacb42e49e21d5691141c2edf885644.tar.gz PeerTube-d9dbf27a7dacb42e49e21d5691141c2edf885644.tar.zst PeerTube-d9dbf27a7dacb42e49e21d5691141c2edf885644.zip | |
Merge branch 'release/5.1.0' into develop
Diffstat (limited to 'server/models/user')
| -rw-r--r-- | server/models/user/user.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/models/user/user.ts b/server/models/user/user.ts index bfc9b3049..b6b120c92 100644 --- a/server/models/user/user.ts +++ b/server/models/user/user.ts | |||
| @@ -781,12 +781,12 @@ export class UserModel extends Model<Partial<AttributesOnly<UserModel>>> { | |||
| 781 | `WHERE "account"."userId" = ${options.whereUserId} ${andWhere}` | 781 | `WHERE "account"."userId" = ${options.whereUserId} ${andWhere}` |
| 782 | 782 | ||
| 783 | const webtorrentFiles = 'SELECT "videoFile"."size" AS "size", "video"."id" AS "videoId" FROM "videoFile" ' + | 783 | const webtorrentFiles = 'SELECT "videoFile"."size" AS "size", "video"."id" AS "videoId" FROM "videoFile" ' + |
| 784 | 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + | 784 | 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" AND "video"."isLive" IS FALSE ' + |
| 785 | videoChannelJoin | 785 | videoChannelJoin |
| 786 | 786 | ||
| 787 | const hlsFiles = 'SELECT "videoFile"."size" AS "size", "video"."id" AS "videoId" FROM "videoFile" ' + | 787 | const hlsFiles = 'SELECT "videoFile"."size" AS "size", "video"."id" AS "videoId" FROM "videoFile" ' + |
| 788 | 'INNER JOIN "videoStreamingPlaylist" ON "videoFile"."videoStreamingPlaylistId" = "videoStreamingPlaylist".id ' + | 788 | 'INNER JOIN "videoStreamingPlaylist" ON "videoFile"."videoStreamingPlaylistId" = "videoStreamingPlaylist".id ' + |
| 789 | 'INNER JOIN "video" ON "videoStreamingPlaylist"."videoId" = "video"."id" ' + | 789 | 'INNER JOIN "video" ON "videoStreamingPlaylist"."videoId" = "video"."id" AND "video"."isLive" IS FALSE ' + |
| 790 | videoChannelJoin | 790 | videoChannelJoin |
| 791 | 791 | ||
| 792 | return 'SELECT COALESCE(SUM("size"), 0) AS "total" ' + | 792 | return 'SELECT COALESCE(SUM("size"), 0) AS "total" ' + |