X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Faccount%2Fuser.ts;h=de193131a27815d8ee31168528beae93eeaa7575;hb=8491293b02ed2ec53eb0fa128161ea0b08d3def9;hp=026bf1318f1d1e23e4b24166964a0a13da20c0d6;hpb=76314386aeafdd6849b7b70c517779d6b2013473;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 026bf1318..de193131a 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts @@ -1,4 +1,4 @@ -import { FindOptions, literal, Op, QueryTypes, where, fn, col, WhereOptions } from 'sequelize' +import { col, FindOptions, fn, literal, Op, QueryTypes, where, WhereOptions } from 'sequelize' import { AfterDestroy, AfterUpdate, @@ -19,7 +19,7 @@ import { Table, UpdatedAt } from 'sequelize-typescript' -import { hasUserRight, MyUser, USER_ROLE_LABELS, UserRight, VideoPlaylistType, VideoPrivacy, VideoAbuseState } from '../../../shared' +import { hasUserRight, MyUser, USER_ROLE_LABELS, UserRight, VideoAbuseState, VideoPlaylistType, VideoPrivacy } from '../../../shared' import { User, UserRole } from '../../../shared/models/users' import { isNoInstanceConfigWarningModal, @@ -68,23 +68,7 @@ import { MUserNotifSettingChannelDefault, MUserWithNotificationSetting, MVideoFullLight -} from '@server/typings/models' - -const literalVideoQuotaUsed: any = [ - literal( - '(' + - 'SELECT COALESCE(SUM("size"), 0) ' + - 'FROM (' + - 'SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' + - 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + - 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + - 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' + - 'WHERE "account"."userId" = "UserModel"."id" GROUP BY "video"."id"' + - ') t' + - ')' - ), - 'videoQuotaUsed' -] +} from '@server/types/models' enum ScopeNames { FOR_ME_API = 'FOR_ME_API', @@ -156,7 +140,17 @@ enum ScopeNames { [ScopeNames.WITH_STATS]: { attributes: { include: [ - literalVideoQuotaUsed, + [ + literal( + '(' + + UserModel.generateUserQuotaBaseSQL({ + withSelect: false, + whereUserId: '"UserModel"."id"' + }) + + ')' + ), + 'videoQuotaUsed' + ], [ literal( '(' + @@ -227,13 +221,13 @@ enum ScopeNames { }) export class UserModel extends Model { - @AllowNull(false) - @Is('UserPassword', value => throwIfNotValid(value, isUserPasswordValid, 'user password')) + @AllowNull(true) + @Is('UserPassword', value => throwIfNotValid(value, isUserPasswordValid, 'user password', true)) @Column password: string @AllowNull(false) - @Is('UserPassword', value => throwIfNotValid(value, isUserUsernameValid, 'user name')) + @Is('UserUsername', value => throwIfNotValid(value, isUserUsernameValid, 'user name')) @Column username: string @@ -354,6 +348,16 @@ export class UserModel extends Model { @Column noWelcomeModal: boolean + @AllowNull(true) + @Default(null) + @Column + pluginAuth: string + + @AllowNull(true) + @Default(null) + @Column + lastLoginDate: Date + @CreatedAt createdAt: Date @@ -389,7 +393,7 @@ export class UserModel extends Model { @BeforeCreate @BeforeUpdate static cryptPasswordIfNeeded (instance: UserModel) { - if (instance.changed('password')) { + if (instance.changed('password') && instance.password) { return cryptPassword(instance.password) .then(hash => { instance.password = hash @@ -408,11 +412,18 @@ export class UserModel extends Model { return this.count() } - static listForApi (start: number, count: number, sort: string, search?: string) { - let where: WhereOptions + static listForApi (parameters: { + start: number + count: number + sort: string + search?: string + blocked?: boolean + }) { + const { start, count, sort, search, blocked } = parameters + const where: WhereOptions = {} if (search) { - where = { + Object.assign(where, { [Op.or]: [ { email: { @@ -425,12 +436,30 @@ export class UserModel extends Model { } } ] - } + }) + } + + if (blocked !== undefined) { + Object.assign(where, { + blocked: blocked + }) } const query: FindOptions = { attributes: { - include: [ literalVideoQuotaUsed ] + include: [ + [ + literal( + '(' + + UserModel.generateUserQuotaBaseSQL({ + withSelect: false, + whereUserId: '"UserModel"."id"' + }) + + ')' + ), + 'videoQuotaUsed' + ] as any // FIXME: typings + ] }, offset: start, limit: count, @@ -659,7 +688,10 @@ export class UserModel extends Model { static getOriginalVideoFileTotalFromUser (user: MUserId) { // Don't use sequelize because we need to use a sub query - const query = UserModel.generateUserQuotaBaseSQL() + const query = UserModel.generateUserQuotaBaseSQL({ + withSelect: true, + whereUserId: '$userId' + }) return UserModel.getTotalRawQuery(query, user.id) } @@ -667,16 +699,38 @@ export class UserModel extends Model { // Returns cumulative size of all video files uploaded in the last 24 hours. static getOriginalVideoFileTotalDailyFromUser (user: MUserId) { // Don't use sequelize because we need to use a sub query - const query = UserModel.generateUserQuotaBaseSQL('"video"."createdAt" > now() - interval \'24 hours\'') + const query = UserModel.generateUserQuotaBaseSQL({ + withSelect: true, + whereUserId: '$userId', + where: '"video"."createdAt" > now() - interval \'24 hours\'' + }) return UserModel.getTotalRawQuery(query, user.id) } static async getStats () { + function getActiveUsers (days: number) { + const query = { + where: { + [Op.and]: [ + literal(`"lastLoginDate" > NOW() - INTERVAL '${days}d'`) + ] + } + } + + return UserModel.count(query) + } + const totalUsers = await UserModel.count() + const totalDailyActiveUsers = await getActiveUsers(1) + const totalWeeklyActiveUsers = await getActiveUsers(7) + const totalMonthlyActiveUsers = await getActiveUsers(30) return { - totalUsers + totalUsers, + totalDailyActiveUsers, + totalWeeklyActiveUsers, + totalMonthlyActiveUsers } } @@ -788,7 +842,11 @@ export class UserModel extends Model { videoChannels: [], - createdAt: this.createdAt + createdAt: this.createdAt, + + pluginAuth: this.pluginAuth, + + lastLoginDate: this.lastLoginDate } if (parameters.withAdminFlags) { @@ -835,18 +893,33 @@ export class UserModel extends Model { return uploadedTotal < this.videoQuota && uploadedDaily < this.videoQuotaDaily } - private static generateUserQuotaBaseSQL (where?: string) { - const andWhere = where ? 'AND ' + where : '' + private static generateUserQuotaBaseSQL (options: { + whereUserId: '$userId' | '"UserModel"."id"' + withSelect: boolean + where?: string + }) { + const andWhere = options.where + ? 'AND ' + options.where + : '' - return 'SELECT SUM("size") AS "total" ' + - 'FROM (' + - 'SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' + - 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + - 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + + const videoChannelJoin = 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' + - 'WHERE "account"."userId" = $userId ' + andWhere + - 'GROUP BY "video"."id"' + - ') t' + `WHERE "account"."userId" = ${options.whereUserId} ${andWhere}` + + const webtorrentFiles = 'SELECT "videoFile"."size" AS "size", "video"."id" AS "videoId" FROM "videoFile" ' + + 'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' + + videoChannelJoin + + const hlsFiles = 'SELECT "videoFile"."size" AS "size", "video"."id" AS "videoId" FROM "videoFile" ' + + 'INNER JOIN "videoStreamingPlaylist" ON "videoFile"."videoStreamingPlaylistId" = "videoStreamingPlaylist".id ' + + 'INNER JOIN "video" ON "videoStreamingPlaylist"."videoId" = "video"."id" ' + + videoChannelJoin + + return 'SELECT COALESCE(SUM("size"), 0) AS "total" ' + + 'FROM (' + + `SELECT MAX("t1"."size") AS "size" FROM (${webtorrentFiles} UNION ${hlsFiles}) t1 ` + + 'GROUP BY "t1"."videoId"' + + ') t2' } private static getTotalRawQuery (query: string, userId: number) {