import { Transaction } from 'sequelize/types'
-import { v4 as uuidv4 } from 'uuid'
-import { UserModel } from '@server/models/account/user'
+import { logger } from '@server/helpers/logger'
+import { CONFIG } from '@server/initializers/config'
+import { UserModel } from '@server/models/user/user'
+import { MActorDefault } from '@server/types/models/actor'
import { ActivityPubActorType } from '../../shared/models/activitypub'
-import { UserNotificationSetting, UserNotificationSettingValue } from '../../shared/models/users'
+import { UserAdminFlag, UserNotificationSetting, UserNotificationSettingValue, UserRole } from '../../shared/models/users'
import { SERVER_ACTOR_NAME, WEBSERVER } from '../initializers/constants'
import { sequelizeTypescript } from '../initializers/database'
import { AccountModel } from '../models/account/account'
-import { UserNotificationSettingModel } from '../models/account/user-notification-setting'
-import { ActorModel } from '../models/activitypub/actor'
-import { MAccountDefault, MActorDefault, MChannelActor } from '../types/models'
-import { MUser, MUserDefault, MUserId } from '../types/models/user'
-import { buildActorInstance, generateAndSaveActorKeys } from './activitypub/actor'
+import { UserNotificationSettingModel } from '../models/user/user-notification-setting'
+import { MAccountDefault, MChannelActor } from '../types/models'
+import { MRegistration, MUser, MUserDefault, MUserId } from '../types/models/user'
+import { generateAndSaveActorKeys } from './activitypub/actors'
import { getLocalAccountActivityPubUrl } from './activitypub/url'
import { Emailer } from './emailer'
-import { LiveManager } from './live-manager'
+import { LiveQuotaStore } from './live/live-quota-store'
+import { buildActorInstance, findAvailableLocalActorName } from './local-actor'
import { Redis } from './redis'
import { createLocalVideoChannel } from './video-channel'
import { createWatchLaterPlaylist } from './video-playlist'
type ChannelNames = { name: string, displayName: string }
+function buildUser (options: {
+ username: string
+ password: string
+ email: string
+
+ role?: UserRole // Default to UserRole.User
+ adminFlags?: UserAdminFlag // Default to UserAdminFlag.NONE
+
+ emailVerified: boolean | null
+
+ videoQuota?: number // Default to CONFIG.USER.VIDEO_QUOTA
+ videoQuotaDaily?: number // Default to CONFIG.USER.VIDEO_QUOTA_DAILY
+
+ pluginAuth?: string
+}): MUser {
+ const {
+ username,
+ password,
+ email,
+ role = UserRole.USER,
+ emailVerified,
+ videoQuota = CONFIG.USER.VIDEO_QUOTA,
+ videoQuotaDaily = CONFIG.USER.VIDEO_QUOTA_DAILY,
+ adminFlags = UserAdminFlag.NONE,
+ pluginAuth
+ } = options
+
+ return new UserModel({
+ username,
+ password,
+ email,
+
+ nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY,
+ p2pEnabled: CONFIG.DEFAULTS.P2P.WEBAPP.ENABLED,
+ autoPlayVideo: true,
+
+ role,
+ emailVerified,
+ adminFlags,
+
+ videoQuota,
+ videoQuotaDaily,
+
+ pluginAuth
+ })
+}
+
+// ---------------------------------------------------------------------------
+
async function createUserAccountAndChannelAndPlaylist (parameters: {
userToCreate: MUser
userDisplayName?: string
displayName: userDisplayName,
userId: userCreated.id,
applicationId: null,
- t: t
+ t
})
userCreated.Account = accountCreated
- const channelAttributes = await buildChannelAttributes(userCreated, channelNames)
+ const channelAttributes = await buildChannelAttributes({ user: userCreated, transaction: t, channelNames })
const videoChannel = await createLocalVideoChannel(channelAttributes, accountCreated, t)
const videoPlaylist = await createWatchLaterPlaylist(accountCreated, t)
const accountCreated = await createLocalAccountWithoutKeys({
name: SERVER_ACTOR_NAME,
userId: null,
- applicationId: applicationId,
+ applicationId,
t: undefined,
type: 'Application'
})
return accountCreated
}
+// ---------------------------------------------------------------------------
+
async function sendVerifyUserEmail (user: MUser, isPendingEmail = false) {
- const verificationString = await Redis.Instance.setVerifyEmailVerificationString(user.id)
- let url = WEBSERVER.URL + '/verify-account/email?userId=' + user.id + '&verificationString=' + verificationString
+ const verificationString = await Redis.Instance.setUserVerifyEmailVerificationString(user.id)
+ let verifyEmailUrl = `${WEBSERVER.URL}/verify-account/email?userId=${user.id}&verificationString=${verificationString}`
+
+ if (isPendingEmail) verifyEmailUrl += '&isPendingEmail=true'
- if (isPendingEmail) url += '&isPendingEmail=true'
+ const to = isPendingEmail
+ ? user.pendingEmail
+ : user.email
- const email = isPendingEmail ? user.pendingEmail : user.email
const username = user.username
- await Emailer.Instance.addVerifyEmailJob(username, email, url)
+ Emailer.Instance.addVerifyEmailJob({ username, to, verifyEmailUrl, isRegistrationRequest: false })
+}
+
+async function sendVerifyRegistrationEmail (registration: MRegistration) {
+ const verificationString = await Redis.Instance.setRegistrationVerifyEmailVerificationString(registration.id)
+ const verifyEmailUrl = `${WEBSERVER.URL}/verify-account/email?registrationId=${registration.id}&verificationString=${verificationString}`
+
+ const to = registration.email
+ const username = registration.username
+
+ Emailer.Instance.addVerifyEmailJob({ username, to, verifyEmailUrl, isRegistrationRequest: true })
}
+// ---------------------------------------------------------------------------
+
async function getOriginalVideoFileTotalFromUser (user: MUserId) {
// Don't use sequelize because we need to use a sub query
const query = UserModel.generateUserQuotaBaseSQL({
withSelect: true,
- whereUserId: '$userId'
+ whereUserId: '$userId',
+ daily: false
})
const base = await UserModel.getTotalRawQuery(query, user.id)
- return base + LiveManager.Instance.getLiveQuotaUsedByUser(user.id)
+ return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id)
}
// Returns cumulative size of all video files uploaded in the last 24 hours.
const query = UserModel.generateUserQuotaBaseSQL({
withSelect: true,
whereUserId: '$userId',
- where: '"video"."createdAt" > now() - interval \'24 hours\''
+ daily: true
})
const base = await UserModel.getTotalRawQuery(query, user.id)
- return base + LiveManager.Instance.getLiveQuotaUsedByUser(user.id)
+ return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id)
}
-async function isAbleToUploadVideo (userId: number, size: number) {
+async function isAbleToUploadVideo (userId: number, newVideoSize: number) {
const user = await UserModel.loadById(userId)
if (user.videoQuota === -1 && user.videoQuotaDaily === -1) return Promise.resolve(true)
getOriginalVideoFileTotalDailyFromUser(user)
])
- const uploadedTotal = size + totalBytes
- const uploadedDaily = size + totalBytesDaily
+ const uploadedTotal = newVideoSize + totalBytes
+ const uploadedDaily = newVideoSize + totalBytesDaily
+
+ logger.debug(
+ 'Check user %d quota to upload another video.', userId,
+ { totalBytes, totalBytesDaily, videoQuota: user.videoQuota, videoQuotaDaily: user.videoQuotaDaily, newVideoSize }
+ )
if (user.videoQuotaDaily === -1) return uploadedTotal < user.videoQuota
if (user.videoQuota === -1) return uploadedDaily < user.videoQuotaDaily
createApplicationActor,
createUserAccountAndChannelAndPlaylist,
createLocalAccountWithoutKeys,
+
sendVerifyUserEmail,
- isAbleToUploadVideo
+ sendVerifyRegistrationEmail,
+
+ isAbleToUploadVideo,
+ buildUser
}
// ---------------------------------------------------------------------------
abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
autoInstanceFollowing: UserNotificationSettingValue.WEB,
newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
- newPluginVersion: UserNotificationSettingValue.WEB
+ newPluginVersion: UserNotificationSettingValue.WEB,
+ myVideoStudioEditionFinished: UserNotificationSettingValue.WEB
}
return UserNotificationSettingModel.create(values, { transaction: t })
}
-async function buildChannelAttributes (user: MUser, channelNames?: ChannelNames) {
- if (channelNames) return channelNames
-
- let channelName = user.username + '_channel'
+async function buildChannelAttributes (options: {
+ user: MUser
+ transaction?: Transaction
+ channelNames?: ChannelNames
+}) {
+ const { user, transaction, channelNames } = options
- // Conflict, generate uuid instead
- const actor = await ActorModel.loadLocalByName(channelName)
- if (actor) channelName = uuidv4()
+ if (channelNames) return channelNames
+ const channelName = await findAvailableLocalActorName(user.username + '_channel', transaction)
const videoChannelDisplayName = `Main ${user.username} channel`
return {
projects / github / Chocobozzz / PeerTube.git / blobdiff