WIP plugins: add storage manager

[github/Chocobozzz/PeerTube.git] / server / lib / avatar.ts

diff --git a/server/lib/avatar.ts b/server/lib/avatar.ts
index a5316df4bb27562a11eef21e55e3d2cccd88674c..09b4e38ca10210016cfb212d47a4968c5fb3135a 100644 (file)
--- a/server/lib/avatar.ts
+++ b/server/lib/avatar.ts
@@ -1,6 +1,6 @@
 import 'multer'
 import { sendUpdateActor } from './activitypub/send'
-import { AVATARS_SIZE, sequelizeTypescript } from '../initializers'
+import { AVATARS_SIZE } from '../initializers/constants'
 import { updateActorAvatarInstance } from './activitypub'
 import { processImage } from '../helpers/image-utils'
 import { AccountModel } from '../models/account/account'
@@ -9,12 +9,13 @@ import { extname, join } from 'path'
 import { retryTransactionWrapper } from '../helpers/database-utils'
 import * as uuidv4 from 'uuid/v4'
 import { CONFIG } from '../initializers/config'
+import { sequelizeTypescript } from '../initializers/database'
 
 async function updateActorAvatarFile (avatarPhysicalFile: Express.Multer.File, accountOrChannel: AccountModel | VideoChannelModel) {
   const extension = extname(avatarPhysicalFile.filename)
   const avatarName = uuidv4() + extension
   const destination = join(CONFIG.STORAGE.AVATARS_DIR, avatarName)
-  await processImage(avatarPhysicalFile, destination, AVATARS_SIZE)
+  await processImage(avatarPhysicalFile.path, destination, AVATARS_SIZE)
 
   return retryTransactionWrapper(() => {
     return sequelizeTypescript.transaction(async t => {