aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/user.ts
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-11-20 09:43:39 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-11-27 19:40:52 +0100
commit54141398354e6e7b94aa3065a705a1251390111c (patch)
tree8d30d1b9ea8acbe04f6d404125b04fc0c9897b70 /server/lib/user.ts
parenteb8b27c93e61a896a08923dc1ca3c87ba8cf4948 (diff)
downloadPeerTube-54141398354e6e7b94aa3065a705a1251390111c.tar.gz
PeerTube-54141398354e6e7b94aa3065a705a1251390111c.tar.zst
PeerTube-54141398354e6e7b94aa3065a705a1251390111c.zip
Refractor activity pub lib/helpers
Diffstat (limited to 'server/lib/user.ts')
-rw-r--r--server/lib/user.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/user.ts b/server/lib/user.ts
index 2d7b36b4f..d54ffc916 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,11 +1,11 @@
1import * as Sequelize from 'sequelize' 1import * as Sequelize from 'sequelize'
2import { getActivityPubUrl } from '../helpers/activitypub'
3import { createPrivateAndPublicKeys } from '../helpers/peertube-crypto' 2import { createPrivateAndPublicKeys } from '../helpers/peertube-crypto'
4import { database as db } from '../initializers' 3import { database as db } from '../initializers'
5import { CONFIG } from '../initializers/constants' 4import { CONFIG } from '../initializers/constants'
6import { UserInstance } from '../models' 5import { UserInstance } from '../models'
7import { createVideoChannel } from './video-channel' 6import { createVideoChannel } from './video-channel'
8import { logger } from '../helpers/logger' 7import { logger } from '../helpers/logger'
8import { getAccountActivityPubUrl } from '../helpers/activitypub'
9 9
10async function createUserAccountAndChannel (user: UserInstance, validateUser = true) { 10async function createUserAccountAndChannel (user: UserInstance, validateUser = true) {
11 const { account, videoChannel } = await db.sequelize.transaction(async t => { 11 const { account, videoChannel } = await db.sequelize.transaction(async t => {
@@ -36,7 +36,7 @@ async function createUserAccountAndChannel (user: UserInstance, validateUser = t
36} 36}
37 37
38async function createLocalAccountWithoutKeys (name: string, userId: number, applicationId: number, t: Sequelize.Transaction) { 38async function createLocalAccountWithoutKeys (name: string, userId: number, applicationId: number, t: Sequelize.Transaction) {
39 const url = getActivityPubUrl('account', name) 39 const url = getAccountActivityPubUrl(name)
40 40
41 const accountInstance = db.Account.build({ 41 const accountInstance = db.Account.build({
42 name, 42 name,