-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,
Table,
UpdatedAt
} from 'sequelize-typescript'
-import { hasUserRight, MyUser, USER_ROLE_LABELS, UserRight, VideoPlaylistType, VideoPrivacy } from '../../../shared'
+import { hasUserRight, MyUser, USER_ROLE_LABELS, UserRight, VideoAbuseState, VideoPlaylistType, VideoPrivacy } from '../../../shared'
import { User, UserRole } from '../../../shared/models/users'
import {
isNoInstanceConfigWarningModal,
import { AccountModel } from './account'
import { NSFWPolicyType } from '../../../shared/models/videos/nsfw-policy.type'
import { values } from 'lodash'
-import { DEFAULT_THEME_NAME, DEFAULT_USER_THEME_NAME, NSFW_POLICY_TYPES } from '../../initializers/constants'
+import { DEFAULT_USER_THEME_NAME, NSFW_POLICY_TYPES } from '../../initializers/constants'
import { clearCacheByUserId } from '../../lib/oauth-model'
import { UserNotificationSettingModel } from './user-notification-setting'
import { VideoModel } from '../video/video'
} from '@server/typings/models'
enum ScopeNames {
- FOR_ME_API = 'FOR_ME_API'
+ FOR_ME_API = 'FOR_ME_API',
+ WITH_VIDEOCHANNELS = 'WITH_VIDEOCHANNELS',
+ WITH_STATS = 'WITH_STATS'
}
@DefaultScope(() => ({
required: true
}
]
+ },
+ [ScopeNames.WITH_VIDEOCHANNELS]: {
+ include: [
+ {
+ model: AccountModel,
+ include: [
+ {
+ model: VideoChannelModel
+ },
+ {
+ attributes: [ 'id', 'name', 'type' ],
+ model: VideoPlaylistModel.unscoped(),
+ required: true,
+ where: {
+ type: {
+ [Op.ne]: VideoPlaylistType.REGULAR
+ }
+ }
+ }
+ ]
+ }
+ ]
+ },
+ [ScopeNames.WITH_STATS]: {
+ attributes: {
+ include: [
+ [
+ literal(
+ '(' +
+ UserModel.generateUserQuotaBaseSQL({
+ withSelect: false,
+ whereUserId: '"UserModel"."id"'
+ }) +
+ ')'
+ ),
+ 'videoQuotaUsed'
+ ],
+ [
+ literal(
+ '(' +
+ 'SELECT COUNT("video"."id") ' +
+ 'FROM "video" ' +
+ 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
+ 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' +
+ 'WHERE "account"."userId" = "UserModel"."id"' +
+ ')'
+ ),
+ 'videosCount'
+ ],
+ [
+ literal(
+ '(' +
+ `SELECT concat_ws(':', "abuses", "acceptedAbuses") ` +
+ 'FROM (' +
+ 'SELECT COUNT("videoAbuse"."id") AS "abuses", ' +
+ `COUNT("videoAbuse"."id") FILTER (WHERE "videoAbuse"."state" = ${VideoAbuseState.ACCEPTED}) AS "acceptedAbuses" ` +
+ 'FROM "videoAbuse" ' +
+ 'INNER JOIN "video" ON "videoAbuse"."videoId" = "video"."id" ' +
+ 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
+ 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' +
+ 'WHERE "account"."userId" = "UserModel"."id"' +
+ ') t' +
+ ')'
+ ),
+ 'videoAbusesCount'
+ ],
+ [
+ literal(
+ '(' +
+ 'SELECT COUNT("videoAbuse"."id") ' +
+ 'FROM "videoAbuse" ' +
+ 'INNER JOIN "account" ON "account"."id" = "videoAbuse"."reporterAccountId" ' +
+ 'WHERE "account"."userId" = "UserModel"."id"' +
+ ')'
+ ),
+ 'videoAbusesCreatedCount'
+ ],
+ [
+ literal(
+ '(' +
+ 'SELECT COUNT("videoComment"."id") ' +
+ 'FROM "videoComment" ' +
+ 'INNER JOIN "account" ON "account"."id" = "videoComment"."accountId" ' +
+ 'WHERE "account"."userId" = "UserModel"."id"' +
+ ')'
+ ),
+ 'videoCommentsCount'
+ ]
+ ]
+ }
}
}))
@Table({
})
export class UserModel extends Model<UserModel> {
- @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
videoQuotaDaily: number
@AllowNull(false)
- @Default(DEFAULT_THEME_NAME)
+ @Default(DEFAULT_USER_THEME_NAME)
@Is('UserTheme', value => throwIfNotValid(value, isThemeNameValid, 'theme'))
@Column
theme: string
@Column
noWelcomeModal: boolean
+ @AllowNull(true)
+ @Default(null)
+ @Column
+ pluginAuth: string
+
+ @AllowNull(true)
+ @Default(null)
+ @Column
+ lastLoginDate: Date
+
@CreatedAt
createdAt: Date
@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
[
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' +
+ UserModel.generateUserQuotaBaseSQL({
+ withSelect: false,
+ whereUserId: '"UserModel"."id"'
+ }) +
')'
),
'videoQuotaUsed'
- ]
+ ] as any // FIXME: typings
]
},
offset: start,
return UserModel.findAll(query)
}
- static loadById (id: number): Bluebird<MUserDefault> {
- return UserModel.findByPk(id)
+ static loadById (id: number, withStats = false): Bluebird<MUserDefault> {
+ const scopes = [
+ ScopeNames.WITH_VIDEOCHANNELS
+ ]
+
+ if (withStats) scopes.push(ScopeNames.WITH_STATS)
+
+ return UserModel.scope(scopes).findByPk(id)
}
static loadByUsername (username: string): Bluebird<MUserDefault> {
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)
}
// 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
}
}
const videoUserId = video.VideoChannel.Account.userId
if (video.isBlacklisted()) {
- return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
+ return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
}
if (video.privacy === VideoPrivacy.PRIVATE) {
- return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
+ return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
}
if (video.privacy === VideoPrivacy.INTERNAL) return true
toFormattedJSON (this: MUserFormattable, parameters: { withAdminFlags?: boolean } = {}): User {
const videoQuotaUsed = this.get('videoQuotaUsed')
const videoQuotaUsedDaily = this.get('videoQuotaUsedDaily')
+ const videosCount = this.get('videosCount')
+ const [ videoAbusesCount, videoAbusesAcceptedCount ] = (this.get('videoAbusesCount') as string || ':').split(':')
+ const videoAbusesCreatedCount = this.get('videoAbusesCreatedCount')
+ const videoCommentsCount = this.get('videoCommentsCount')
const json: User = {
id: this.id,
videoQuotaUsedDaily: videoQuotaUsedDaily !== undefined
? parseInt(videoQuotaUsedDaily + '', 10)
: undefined,
+ videosCount: videosCount !== undefined
+ ? parseInt(videosCount + '', 10)
+ : undefined,
+ videoAbusesCount: videoAbusesCount
+ ? parseInt(videoAbusesCount, 10)
+ : undefined,
+ videoAbusesAcceptedCount: videoAbusesAcceptedCount
+ ? parseInt(videoAbusesAcceptedCount, 10)
+ : undefined,
+ videoAbusesCreatedCount: videoAbusesCreatedCount !== undefined
+ ? parseInt(videoAbusesCreatedCount + '', 10)
+ : undefined,
+ videoCommentsCount: videoCommentsCount !== undefined
+ ? parseInt(videoCommentsCount + '', 10)
+ : undefined,
noInstanceConfigWarningModal: this.noInstanceConfigWarningModal,
noWelcomeModal: this.noWelcomeModal,
videoChannels: [],
- createdAt: this.createdAt
+ createdAt: this.createdAt,
+
+ pluginAuth: this.pluginAuth,
+
+ lastLoginDate: this.lastLoginDate
}
if (parameters.withAdminFlags) {
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) {