import * as Sequelize from 'sequelize'
import {
+ AfterDelete,
+ AfterUpdate,
AllowNull,
BeforeCreate,
BeforeUpdate,
import { User, UserRole } from '../../../shared/models/users'
import {
isUserAutoPlayVideoValid,
- isUserDisplayNSFWValid,
+ isUserBlockedReasonValid,
+ isUserBlockedValid,
+ isUserEmailVerifiedValid,
+ isUserNSFWPolicyValid,
isUserPasswordValid,
isUserRoleValid,
isUserUsernameValid,
- isUserVideoQuotaValid
+ isUserVideoQuotaDailyValid,
+ isUserVideoQuotaValid,
+ isUserWebTorrentPolicyValid
} from '../../helpers/custom-validators/users'
import { comparePassword, cryptPassword } from '../../helpers/peertube-crypto'
import { OAuthTokenModel } from '../oauth/oauth-token'
import { getSort, throwIfNotValid } from '../utils'
import { VideoChannelModel } from '../video/video-channel'
import { AccountModel } from './account'
+import { NSFWPolicyType } from '../../../shared/models/videos/nsfw-policy.type'
+import { WebTorrentPolicyType } from '../../../shared/models/users/user-webtorrent-policy.type'
+import { values } from 'lodash'
+import { NSFW_POLICY_TYPES, WEBTORRENT_POLICY_TYPES } from '../../initializers'
+import { clearCacheByUserId } from '../../lib/oauth-model'
+
+enum ScopeNames {
+ WITH_VIDEO_CHANNEL = 'WITH_VIDEO_CHANNEL'
+}
@DefaultScope({
include: [
]
})
@Scopes({
- withVideoChannel: {
+ [ScopeNames.WITH_VIDEO_CHANNEL]: {
include: [
{
model: () => AccountModel,
@Column(DataType.STRING(400))
email: string
- @AllowNull(false)
- @Default(false)
- @Is('UserDisplayNSFW', value => throwIfNotValid(value, isUserDisplayNSFWValid, 'display NSFW boolean'))
+ @AllowNull(true)
+ @Default(null)
+ @Is('UserEmailVerified', value => throwIfNotValid(value, isUserEmailVerifiedValid, 'email verified boolean'))
@Column
- displayNSFW: boolean
+ emailVerified: boolean
+
+ @AllowNull(false)
+ @Is('UserNSFWPolicy', value => throwIfNotValid(value, isUserNSFWPolicyValid, 'NSFW policy'))
+ @Column(DataType.ENUM(values(NSFW_POLICY_TYPES)))
+ nsfwPolicy: NSFWPolicyType
+
+ @AllowNull(false)
+ @Is('UserWebTorrentPolicy', value => throwIfNotValid(value, isUserWebTorrentPolicyValid, 'WebTorrent policy'))
+ @Column(DataType.ENUM(values(WEBTORRENT_POLICY_TYPES)))
+ webTorrentPolicy: WebTorrentPolicyType
@AllowNull(false)
@Default(true)
@Column
autoPlayVideo: boolean
+ @AllowNull(false)
+ @Default(false)
+ @Is('UserBlocked', value => throwIfNotValid(value, isUserBlockedValid, 'blocked boolean'))
+ @Column
+ blocked: boolean
+
+ @AllowNull(true)
+ @Default(null)
+ @Is('UserBlockedReason', value => throwIfNotValid(value, isUserBlockedReasonValid, 'blocked reason'))
+ @Column
+ blockedReason: string
+
@AllowNull(false)
@Is('UserRole', value => throwIfNotValid(value, isUserRoleValid, 'role'))
@Column
@Column(DataType.BIGINT)
videoQuota: number
+ @AllowNull(false)
+ @Is('UserVideoQuotaDaily', value => throwIfNotValid(value, isUserVideoQuotaDailyValid, 'video quota daily'))
+ @Column(DataType.BIGINT)
+ videoQuotaDaily: number
+
@CreatedAt
createdAt: Date
}
}
+ @AfterUpdate
+ @AfterDelete
+ static removeTokenCache (instance: UserModel) {
+ return clearCacheByUserId(instance.id)
+ }
+
static countTotal () {
return this.count()
}
- static listForApi (start: number, count: number, sort: string) {
+ static listForApi (start: number, count: number, sort: string, search?: string) {
+ let where = undefined
+ if (search) {
+ where = {
+ [Sequelize.Op.or]: [
+ {
+ email: {
+ [Sequelize.Op.iLike]: '%' + search + '%'
+ }
+ },
+ {
+ username: {
+ [ Sequelize.Op.iLike ]: '%' + search + '%'
+ }
+ }
+ ]
+ }
+ }
+
const query = {
+ attributes: {
+ include: [
+ [
+ Sequelize.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'
+ ] as any // FIXME: typings
+ ]
+ },
offset: start,
limit: count,
- order: getSort(sort)
+ order: getSort(sort),
+ where
}
return UserModel.findAndCountAll(query)
.map(k => parseInt(k, 10) as UserRole)
.filter(role => hasUserRight(role, right))
- console.log(roles)
-
const query = {
attribute: [ 'email' ],
where: {
}
}
- return UserModel.scope('withVideoChannel').findOne(query)
+ return UserModel.scope(ScopeNames.WITH_VIDEO_CHANNEL).findOne(query)
}
static loadByEmail (email: string) {
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" ' +
- 'INNER JOIN "user" ON "account"."userId" = "user"."id" ' +
- 'WHERE "user"."id" = $userId GROUP BY "video"."id") t'
+ const query = UserModel.generateUserQuotaBaseSQL()
- const options = {
- bind: { userId: user.id },
- type: Sequelize.QueryTypes.SELECT
- }
- return UserModel.sequelize.query(query, options)
- .then(([ { total } ]) => {
- if (total === null) return 0
+ return UserModel.getTotalRawQuery(query, user.id)
+ }
- return parseInt(total, 10)
- })
+ // 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 = UserModel.generateUserQuotaBaseSQL('"video"."createdAt" > now() - interval \'24 hours\'')
+
+ 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)
}
}
toFormattedJSON (): User {
+ const videoQuotaUsed = this.get('videoQuotaUsed')
+ const videoQuotaUsedDaily = this.get('videoQuotaUsedDaily')
+
const json = {
id: this.id,
username: this.username,
email: this.email,
- displayNSFW: this.displayNSFW,
+ emailVerified: this.emailVerified,
+ nsfwPolicy: this.nsfwPolicy,
+ webTorrentPolicy: this.webTorrentPolicy,
autoPlayVideo: this.autoPlayVideo,
role: this.role,
roleLabel: USER_ROLE_LABELS[ this.role ],
videoQuota: this.videoQuota,
+ videoQuotaDaily: this.videoQuotaDaily,
createdAt: this.createdAt,
+ blocked: this.blocked,
+ blockedReason: this.blockedReason,
account: this.Account.toFormattedJSON(),
- videoChannels: []
+ videoChannels: [],
+ videoQuotaUsed: videoQuotaUsed !== undefined
+ ? parseInt(videoQuotaUsed, 10)
+ : undefined,
+ videoQuotaUsedDaily: videoQuotaUsedDaily !== undefined
+ ? parseInt(videoQuotaUsedDaily, 10)
+ : undefined
}
if (Array.isArray(this.Account.VideoChannels) === true) {
return json
}
- isAbleToUploadVideo (videoFile: Express.Multer.File) {
- if (this.videoQuota === -1) return Promise.resolve(true)
+ async isAbleToUploadVideo (videoFile: { size: number }) {
+ if (this.videoQuota === -1 && this.videoQuotaDaily === -1) return Promise.resolve(true)
- return UserModel.getOriginalVideoFileTotalFromUser(this)
- .then(totalBytes => {
- return (videoFile.size + totalBytes) < this.videoQuota
- })
+ const [ totalBytes, totalBytesDaily ] = await Promise.all([
+ UserModel.getOriginalVideoFileTotalFromUser(this),
+ UserModel.getOriginalVideoFileTotalDailyFromUser(this)
+ ])
+
+ const uploadedTotal = videoFile.size + totalBytes
+ const uploadedDaily = videoFile.size + totalBytesDaily
+ if (this.videoQuotaDaily === -1) {
+ return uploadedTotal < this.videoQuota
+ }
+ if (this.videoQuota === -1) {
+ return uploadedDaily < this.videoQuotaDaily
+ }
+
+ 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)
+ })
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff