X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=230bf37d0f55cb1351de2603900ec4dd01870412;hb=b65de1be4dcf626c552be613d531d3f6e23c6085;hp=0e40077707fc823a8719674a891437821e004def;hpb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/user.ts b/server/lib/user.ts index 0e4007770..230bf37d0 100644 --- a/server/lib/user.ts +++ b/server/lib/user.ts @@ -1,27 +1,33 @@ -import * as uuidv4 from 'uuid/v4' +import { Transaction } from 'sequelize/types' +import { buildUUID } from '@shared/core-utils/uuid' +import { UserModel } from '@server/models/user/user' +import { MActorDefault } from '@server/types/models/actor' import { ActivityPubActorType } from '../../shared/models/activitypub' -import { SERVER_ACTOR_NAME, WEBSERVER } from '../initializers/constants' -import { AccountModel } from '../models/account/account' -import { UserModel } from '../models/account/user' -import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub' -import { createVideoChannel } from './video-channel' -import { VideoChannelModel } from '../models/video/video-channel' -import { ActorModel } from '../models/activitypub/actor' -import { UserNotificationSettingModel } from '../models/account/user-notification-setting' import { UserNotificationSetting, UserNotificationSettingValue } from '../../shared/models/users' -import { createWatchLaterPlaylist } from './video-playlist' +import { SERVER_ACTOR_NAME, WEBSERVER } from '../initializers/constants' import { sequelizeTypescript } from '../initializers/database' -import { Transaction } from 'sequelize/types' -import { Redis } from './redis' +import { AccountModel } from '../models/account/account' +import { ActorModel } from '../models/actor/actor' +import { UserNotificationSettingModel } from '../models/user/user-notification-setting' +import { MAccountDefault, MChannelActor } from '../types/models' +import { MUser, MUserDefault, MUserId } from '../types/models/user' +import { generateAndSaveActorKeys } from './activitypub/actors' +import { getLocalAccountActivityPubUrl } from './activitypub/url' import { Emailer } from './emailer' +import { LiveQuotaStore } from './live/live-quota-store' +import { buildActorInstance } from './local-actor' +import { Redis } from './redis' +import { createLocalVideoChannel } from './video-channel' +import { createWatchLaterPlaylist } from './video-playlist' type ChannelNames = { name: string, displayName: string } + async function createUserAccountAndChannelAndPlaylist (parameters: { - userToCreate: UserModel, - userDisplayName?: string, - channelNames?: ChannelNames, + userToCreate: MUser + userDisplayName?: string + channelNames?: ChannelNames validateUser?: boolean -}) { +}): Promise<{ user: MUserDefault, account: MAccountDefault, videoChannel: MChannelActor }> { const { userToCreate, userDisplayName, channelNames, validateUser = true } = parameters const { user, account, videoChannel } = await sequelizeTypescript.transaction(async t => { @@ -30,7 +36,7 @@ async function createUserAccountAndChannelAndPlaylist (parameters: { validate: validateUser } - const userCreated = await userToCreate.save(userOptions) + const userCreated: MUserDefault = await userToCreate.save(userOptions) userCreated.NotificationSetting = await createDefaultUserNotificationSettings(userCreated, t) const accountCreated = await createLocalAccountWithoutKeys({ @@ -38,42 +44,42 @@ async function createUserAccountAndChannelAndPlaylist (parameters: { displayName: userDisplayName, userId: userCreated.id, applicationId: null, - t: t + t }) userCreated.Account = accountCreated - const channelAttributes = await buildChannelAttributes(userCreated, channelNames) - const videoChannel = await createVideoChannel(channelAttributes, accountCreated, t) + const channelAttributes = await buildChannelAttributes(userCreated, t, channelNames) + const videoChannel = await createLocalVideoChannel(channelAttributes, accountCreated, t) const videoPlaylist = await createWatchLaterPlaylist(accountCreated, t) return { user: userCreated, account: accountCreated, videoChannel, videoPlaylist } }) - const [ accountKeys, channelKeys ] = await Promise.all([ - setAsyncActorKeys(account.Actor), - setAsyncActorKeys(videoChannel.Actor) + const [ accountActorWithKeys, channelActorWithKeys ] = await Promise.all([ + generateAndSaveActorKeys(account.Actor), + generateAndSaveActorKeys(videoChannel.Actor) ]) - account.Actor = accountKeys - videoChannel.Actor = channelKeys + account.Actor = accountActorWithKeys + videoChannel.Actor = channelActorWithKeys - return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel } + return { user, account, videoChannel } } async function createLocalAccountWithoutKeys (parameters: { - name: string, - displayName?: string, - userId: number | null, - applicationId: number | null, - t: Transaction | undefined, + name: string + displayName?: string + userId: number | null + applicationId: number | null + t: Transaction | undefined type?: ActivityPubActorType }) { const { name, displayName, userId, applicationId, t, type = 'Person' } = parameters - const url = getAccountActivityPubUrl(name) + const url = getLocalAccountActivityPubUrl(name) const actorInstance = buildActorInstance(type, url, name) - const actorInstanceCreated = await actorInstance.save({ transaction: t }) + const actorInstanceCreated: MActorDefault = await actorInstance.save({ transaction: t }) const accountInstance = new AccountModel({ name: displayName || name, @@ -82,7 +88,7 @@ async function createLocalAccountWithoutKeys (parameters: { actorId: actorInstanceCreated.id }) - const accountInstanceCreated = await accountInstance.save({ transaction: t }) + const accountInstanceCreated: MAccountDefault = await accountInstance.save({ transaction: t }) accountInstanceCreated.Actor = actorInstanceCreated return accountInstanceCreated @@ -97,60 +103,114 @@ async function createApplicationActor (applicationId: number) { type: 'Application' }) - accountCreated.Actor = await setAsyncActorKeys(accountCreated.Actor) + accountCreated.Actor = await generateAndSaveActorKeys(accountCreated.Actor) return accountCreated } -async function sendVerifyUserEmail (user: UserModel, isPendingEmail = false) { +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 if (isPendingEmail) url += '&isPendingEmail=true' const email = isPendingEmail ? user.pendingEmail : user.email + const username = user.username + + await Emailer.Instance.addVerifyEmailJob(username, email, url) +} + +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' + }) + + const base = await UserModel.getTotalRawQuery(query, user.id) + + return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id) +} + +// Returns cumulative size of all video files uploaded in the last 24 hours. +async function getOriginalVideoFileTotalDailyFromUser (user: MUserId) { + // Don't use sequelize because we need to use a sub query + const query = UserModel.generateUserQuotaBaseSQL({ + withSelect: true, + whereUserId: '$userId', + where: '"video"."createdAt" > now() - interval \'24 hours\'' + }) + + const base = await UserModel.getTotalRawQuery(query, user.id) + + return base + LiveQuotaStore.Instance.getLiveQuotaOf(user.id) +} + +async function isAbleToUploadVideo (userId: number, newVideoSize: number) { + const user = await UserModel.loadById(userId) + + if (user.videoQuota === -1 && user.videoQuotaDaily === -1) return Promise.resolve(true) + + const [ totalBytes, totalBytesDaily ] = await Promise.all([ + getOriginalVideoFileTotalFromUser(user), + getOriginalVideoFileTotalDailyFromUser(user) + ]) + + const uploadedTotal = newVideoSize + totalBytes + const uploadedDaily = newVideoSize + totalBytesDaily + + if (user.videoQuotaDaily === -1) return uploadedTotal < user.videoQuota + if (user.videoQuota === -1) return uploadedDaily < user.videoQuotaDaily - await Emailer.Instance.addVerifyEmailJob(email, url) + return uploadedTotal < user.videoQuota && uploadedDaily < user.videoQuotaDaily } // --------------------------------------------------------------------------- export { + getOriginalVideoFileTotalFromUser, + getOriginalVideoFileTotalDailyFromUser, createApplicationActor, createUserAccountAndChannelAndPlaylist, createLocalAccountWithoutKeys, - sendVerifyUserEmail + sendVerifyUserEmail, + isAbleToUploadVideo } // --------------------------------------------------------------------------- -function createDefaultUserNotificationSettings (user: UserModel, t: Transaction | undefined) { +function createDefaultUserNotificationSettings (user: MUserId, t: Transaction | undefined) { const values: UserNotificationSetting & { userId: number } = { userId: user.id, newVideoFromSubscription: UserNotificationSettingValue.WEB, newCommentOnMyVideo: UserNotificationSettingValue.WEB, myVideoImportFinished: UserNotificationSettingValue.WEB, myVideoPublished: UserNotificationSettingValue.WEB, - videoAbuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, + abuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, newUserRegistration: UserNotificationSettingValue.WEB, commentMention: UserNotificationSettingValue.WEB, newFollow: UserNotificationSettingValue.WEB, - newInstanceFollower: UserNotificationSettingValue.WEB + newInstanceFollower: UserNotificationSettingValue.WEB, + abuseNewMessage: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, + abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, + autoInstanceFollowing: UserNotificationSettingValue.WEB, + newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, + newPluginVersion: UserNotificationSettingValue.WEB } return UserNotificationSettingModel.create(values, { transaction: t }) } -async function buildChannelAttributes (user: UserModel, channelNames?: ChannelNames) { +async function buildChannelAttributes (user: MUser, transaction?: Transaction, channelNames?: ChannelNames) { if (channelNames) return channelNames let channelName = user.username + '_channel' // Conflict, generate uuid instead - const actor = await ActorModel.loadLocalByName(channelName) - if (actor) channelName = uuidv4() + const actor = await ActorModel.loadLocalByName(channelName, transaction) + if (actor) channelName = buildUUID() const videoChannelDisplayName = `Main ${user.username} channel`