X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=8a6fcebc7b3d4d2ccd0127a08416f6ab077718e2;hb=7d9ba5c08999c6482f0bc5e0c09c6f55b7724090;hp=e1892f22c89646b08a68f32ddb6b52985d7f1894;hpb=8795d6f254bd8f88c385bf77b82cc6f177c94df9;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/user.ts b/server/lib/user.ts index e1892f22c..8a6fcebc7 100644 --- a/server/lib/user.ts +++ b/server/lib/user.ts @@ -1,14 +1,15 @@ import { Transaction } from 'sequelize/types' import { v4 as uuidv4 } from 'uuid' -import { UserModel } from '@server/models/account/user' +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 { 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 { 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 { buildActorInstance, generateAndSaveActorKeys } from './activitypub/actor' import { getLocalAccountActivityPubUrl } from './activitypub/url' @@ -193,7 +194,9 @@ function createDefaultUserNotificationSettings (user: MUserId, t: Transaction | newInstanceFollower: UserNotificationSettingValue.WEB, abuseNewMessage: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, - autoInstanceFollowing: UserNotificationSettingValue.WEB + autoInstanceFollowing: UserNotificationSettingValue.WEB, + newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, + newPluginVersion: UserNotificationSettingValue.WEB } return UserNotificationSettingModel.create(values, { transaction: t })