aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-13 16:00:39 +0100
committerChocobozzz <me@florianbigard.com>2018-03-13 16:00:39 +0100
commitc39ea24b7199a391e57c698e93d76d30bc0e9399 (patch)
treecf3bc63fd3fed1203f13d66b6acf74e8be82ebfa /server
parent5c328e6610f451d114c30d3a3b4e5d41b3b4b612 (diff)
downloadPeerTube-c39ea24b7199a391e57c698e93d76d30bc0e9399.tar.gz
PeerTube-c39ea24b7199a391e57c698e93d76d30bc0e9399.tar.zst
PeerTube-c39ea24b7199a391e57c698e93d76d30bc0e9399.zip
Upgrade server depencencies
Diffstat (limited to 'server')
-rw-r--r--server/helpers/database-utils.ts2
-rw-r--r--server/lib/user.ts3
2 files changed, 2 insertions, 3 deletions
diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index b4adaf9cc..31808f9e4 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -36,7 +36,7 @@ function transactionRetryer <T> (func: (err: any, data: T) => any) {
36 }) 36 })
37} 37}
38 38
39function updateInstanceWithAnother <T> (instanceToUpdate: Model<T>, baseInstance: Model<T>) { 39function updateInstanceWithAnother <T extends Model<T>> (instanceToUpdate: Model<T>, baseInstance: Model<T>) {
40 const obj = baseInstance.toJSON() 40 const obj = baseInstance.toJSON()
41 41
42 for (const key of Object.keys(obj)) { 42 for (const key of Object.keys(obj)) {
diff --git a/server/lib/user.ts b/server/lib/user.ts
index aa029cce7..2ea7481e8 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -47,8 +47,7 @@ async function createLocalAccountWithoutKeys (
47 name, 47 name,
48 userId, 48 userId,
49 applicationId, 49 applicationId,
50 actorId: actorInstanceCreated.id, 50 actorId: actorInstanceCreated.id
51 serverId: null // It is our server
52 }) 51 })
53 52
54 const accountInstanceCreated = await accountInstance.save({ transaction: t }) 53 const accountInstanceCreated = await accountInstance.save({ transaction: t })