isUserAutoPlayVideoValid,
isUserBlockedReasonValid,
isUserBlockedValid,
+ isUserEmailVerifiedValid,
isUserNSFWPolicyValid,
isUserPasswordValid,
isUserRoleValid,
isUserUsernameValid,
- isUserVideoQuotaValid,
- isUserVideoQuotaDailyValid
+ isUserVideoQuotaDailyValid,
+ isUserVideoQuotaValid
} from '../../helpers/custom-validators/users'
import { comparePassword, cryptPassword } from '../../helpers/peertube-crypto'
import { OAuthTokenModel } from '../oauth/oauth-token'
@Column(DataType.STRING(400))
email: string
+ @AllowNull(true)
+ @Default(null)
+ @Is('UserEmailVerified', value => throwIfNotValid(value, isUserEmailVerifiedValid, 'email verified boolean'))
+ @Column
+ emailVerified: boolean
+
@AllowNull(false)
@Is('UserNSFWPolicy', value => throwIfNotValid(value, isUserNSFWPolicyValid, 'NSFW policy'))
@Column(DataType.ENUM(values(NSFW_POLICY_TYPES)))
[
Sequelize.literal(
'(' +
- 'SELECT COALESCE(SUM("size"), 0) FROM ' +
- '(' +
+ '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" ' +
return UserModel.findAndCountAll(query)
.then(({ rows, count }) => {
- console.log(rows[0])
- console.log(rows[0]['videoQuotaUsed'])
- console.log(rows[0].get('videoQuotaUsed'))
return {
data: rows,
total: count
.map(k => parseInt(k, 10) as UserRole)
.filter(role => hasUserRight(role, right))
- console.log(roles)
-
const query = {
attribute: [ 'email' ],
where: {
static getOriginalVideoFileTotalFromUser (user: UserModel) {
// Don't use sequelize because we need to use a sub query
- const query = '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" ' +
- 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' +
- 'WHERE "account"."userId" = $userId ' +
- 'GROUP BY "video"."id") t'
-
- const options = {
- bind: { userId: user.id },
- type: Sequelize.QueryTypes.SELECT
- }
- return UserModel.sequelize.query(query, options)
- .then(([ { total } ]) => {
- if (total === null) return 0
+ const query = UserModel.generateUserQuotaBaseSQL()
- return parseInt(total, 10)
- })
+ return UserModel.getTotalRawQuery(query, user.id)
}
- // Returns comulative size of all video files uploaded in the last 24 hours.
+ // Returns cumulative size of all video files uploaded in the last 24 hours.
static getOriginalVideoFileTotalDailyFromUser (user: UserModel) {
// Don't use sequelize because we need to use a sub query
- const query = '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" ' +
- 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' +
- 'WHERE "account"."userId" = $userId ' +
- 'AND "video"."createdAt" > now() - interval \'24 hours\'' +
- 'GROUP BY "video"."id") t'
+ const query = UserModel.generateUserQuotaBaseSQL('"video"."createdAt" > now() - interval \'24 hours\'')
- const options = {
- bind: { userId: user.id },
- type: Sequelize.QueryTypes.SELECT
- }
- return UserModel.sequelize.query(query, options)
- .then(([ { total } ]) => {
- if (total === null) return 0
-
- return parseInt(total, 10)
- })
+ return UserModel.getTotalRawQuery(query, user.id)
}
static async getStats () {
}
}
+ static autoComplete (search: string) {
+ const query = {
+ where: {
+ username: {
+ [ Sequelize.Op.like ]: `%${search}%`
+ }
+ },
+ limit: 10
+ }
+
+ return UserModel.findAll(query)
+ .then(u => u.map(u => u.username))
+ }
+
hasRight (right: UserRight) {
return hasUserRight(this.role, right)
}
id: this.id,
username: this.username,
email: this.email,
+ emailVerified: this.emailVerified,
nsfwPolicy: this.nsfwPolicy,
autoPlayVideo: this.autoPlayVideo,
role: this.role,
return (uploadedTotal < this.videoQuota) &&
(uploadedDaily < this.videoQuotaDaily)
}
+
+ private static generateUserQuotaBaseSQL (where?: string) {
+ const andWhere = where ? 'AND ' + 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" ' +
+ 'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' +
+ 'WHERE "account"."userId" = $userId ' + andWhere +
+ 'GROUP BY "video"."id"' +
+ ') t'
+ }
+
+ private static getTotalRawQuery (query: string, userId: number) {
+ const options = {
+ bind: { userId },
+ type: Sequelize.QueryTypes.SELECT
+ }
+
+ return UserModel.sequelize.query(query, options)
+ .then(([ { total } ]) => {
+ if (total === null) return 0
+
+ return parseInt(total, 10)
+ })
+ }
}