import * as Sequelize from 'sequelize'
import {
- AllowNull, BeforeCreate, BeforeUpdate, Column, CreatedAt, DataType, Default, DefaultScope, HasMany, HasOne, Is, IsEmail, Model,
- Scopes, Table, UpdatedAt
+ AllowNull,
+ BeforeCreate,
+ BeforeUpdate,
+ Column,
+ CreatedAt,
+ DataType,
+ Default,
+ DefaultScope,
+ HasMany,
+ HasOne,
+ Is,
+ IsEmail,
+ Model,
+ Scopes,
+ Table,
+ UpdatedAt
} from 'sequelize-typescript'
import { hasUserRight, USER_ROLE_LABELS, UserRight } from '../../../shared'
-import { comparePassword, cryptPassword } from '../../helpers'
+import { User, UserRole } from '../../../shared/models/users'
import {
- isUserAutoPlayVideoValid, isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid,
+ isUserAutoPlayVideoValid,
+ isUserNSFWPolicyValid,
+ isUserPasswordValid,
+ isUserRoleValid,
+ isUserUsernameValid,
isUserVideoQuotaValid
} 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 { values } from 'lodash'
+import { NSFW_POLICY_TYPES } from '../../initializers'
+
+enum ScopeNames {
+ WITH_VIDEO_CHANNEL = 'WITH_VIDEO_CHANNEL'
+}
@DefaultScope({
include: [
]
})
@Scopes({
- withVideoChannel: {
+ [ScopeNames.WITH_VIDEO_CHANNEL]: {
include: [
{
model: () => AccountModel,
email: string
@AllowNull(false)
- @Default(false)
- @Is('UserDisplayNSFW', value => throwIfNotValid(value, isUserDisplayNSFWValid, 'display NSFW boolean'))
- @Column
- displayNSFW: boolean
+ @Is('UserNSFWPolicy', value => throwIfNotValid(value, isUserNSFWPolicyValid, 'NSFW policy'))
+ @Column(DataType.ENUM(values(NSFW_POLICY_TYPES)))
+ nsfwPolicy: NSFWPolicyType
@AllowNull(false)
@Default(true)
@HasOne(() => AccountModel, {
foreignKey: 'userId',
- onDelete: 'cascade'
+ onDelete: 'cascade',
+ hooks: true
})
Account: AccountModel
return this.count()
}
- static getByUsername (username: string) {
- const query = {
- where: {
- username: username
- },
- include: [ { model: AccountModel, required: true } ]
- }
-
- return UserModel.findOne(query)
- }
-
static listForApi (start: number, count: number, sort: string) {
const query = {
offset: start,
limit: count,
- order: [ getSort(sort) ]
+ order: getSort(sort)
}
return UserModel.findAndCountAll(query)
})
}
+ static listEmailsWithRight (right: UserRight) {
+ const roles = Object.keys(USER_ROLE_LABELS)
+ .map(k => parseInt(k, 10) as UserRole)
+ .filter(role => hasUserRight(role, right))
+
+ console.log(roles)
+
+ const query = {
+ attribute: [ 'email' ],
+ where: {
+ role: {
+ [Sequelize.Op.in]: roles
+ }
+ }
+ }
+
+ return UserModel.unscoped()
+ .findAll(query)
+ .then(u => u.map(u => u.email))
+ }
+
static loadById (id: number) {
return UserModel.findById(id)
}
}
}
- return UserModel.scope('withVideoChannel').findOne(query)
+ return UserModel.scope(ScopeNames.WITH_VIDEO_CHANNEL).findOne(query)
}
- static loadByUsernameOrEmail (username: string, email: string) {
+ static loadByEmail (email: string) {
+ const query = {
+ where: {
+ email
+ }
+ }
+
+ return UserModel.findOne(query)
+ }
+
+ static loadByUsernameOrEmail (username: string, email?: string) {
+ if (!email) email = username
+
const query = {
where: {
[ Sequelize.Op.or ]: [ { username }, { email } ]
return UserModel.findOne(query)
}
- private static getOriginalVideoFileTotalFromUser (user: UserModel) {
+ 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" ' +
})
}
+ static async getStats () {
+ const totalUsers = await UserModel.count()
+
+ return {
+ totalUsers
+ }
+ }
+
hasRight (right: UserRight) {
return hasUserRight(this.role, right)
}
return comparePassword(password, this.password)
}
- toFormattedJSON () {
+ toFormattedJSON (): User {
const json = {
id: this.id,
username: this.username,
email: this.email,
- displayNSFW: this.displayNSFW,
+ nsfwPolicy: this.nsfwPolicy,
autoPlayVideo: this.autoPlayVideo,
role: this.role,
roleLabel: USER_ROLE_LABELS[ this.role ],
videoQuota: this.videoQuota,
createdAt: this.createdAt,
- account: this.Account.toFormattedJSON()
+ account: this.Account.toFormattedJSON(),
+ videoChannels: []
}
if (Array.isArray(this.Account.VideoChannels) === true) {
- json['videoChannels'] = this.Account.VideoChannels
+ json.videoChannels = this.Account.VideoChannels
.map(c => c.toFormattedJSON())
.sort((v1, v2) => {
if (v1.createdAt < v2.createdAt) return -1