X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=8b447583e12c4cabc8a51af69ac2d9ddcbaa491d;hb=ebefc902f59be6c5542c19ff706e310d9dddf75f;hp=88e60a7df5c0d7cd59fb7474dd92e7d1bb645494;hpb=a3b7421abb4192e215aa280418b62e96958c5e42;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/user.ts b/server/lib/user.ts index 88e60a7df..8b447583e 100644 --- a/server/lib/user.ts +++ b/server/lib/user.ts @@ -1,8 +1,8 @@ -import * as uuidv4 from 'uuid/v4' +import { v4 as uuidv4 } from 'uuid' import { ActivityPubActorType } from '../../shared/models/activitypub' import { SERVER_ACTOR_NAME, WEBSERVER } from '../initializers/constants' import { AccountModel } from '../models/account/account' -import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub' +import { buildActorInstance, setAsyncActorKeys } from './activitypub/actor' import { createLocalVideoChannel } from './video-channel' import { ActorModel } from '../models/activitypub/actor' import { UserNotificationSettingModel } from '../models/account/user-notification-setting' @@ -14,6 +14,7 @@ import { Redis } from './redis' import { Emailer } from './emailer' import { MAccountDefault, MActorDefault, MChannelActor } from '../typings/models' import { MUser, MUserDefault, MUserId } from '../typings/models/user' +import { getAccountActivityPubUrl } from './activitypub/url' type ChannelNames = { name: string, displayName: string }