Unify paginator disabling when no result is displayable, fix batch domain add for...

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

diff --git a/server/lib/avatar.ts b/server/lib/avatar.ts
index 9005b3e225e1270fe696f24149784421cb87b12f..3de45dd1926e7eead75e07b2f352d67ec260ba89 100644 (file)
--- a/server/lib/avatar.ts
+++ b/server/lib/avatar.ts
@@ -5,17 +5,17 @@ import { updateActorAvatarInstance } from './activitypub'
 import { processImage } from '../helpers/image-utils'
 import { extname, join } from 'path'
 import { retryTransactionWrapper } from '../helpers/database-utils'
-import * as uuidv4 from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 import { CONFIG } from '../initializers/config'
 import { sequelizeTypescript } from '../initializers/database'
 import * as LRUCache from 'lru-cache'
 import { queue } from 'async'
 import { downloadImage } from '../helpers/requests'
-import { MAccountActorDefault, MChannelActorDefault } from '../typings/models'
+import { MAccountDefault, MChannelDefault } from '../typings/models'
 
 async function updateActorAvatarFile (
   avatarPhysicalFile: Express.Multer.File,
-  accountOrChannel: MAccountActorDefault | MChannelActorDefault
+  accountOrChannel: MAccountDefault | MChannelDefault
 ) {
   const extension = extname(avatarPhysicalFile.filename)
   const avatarName = uuidv4() + extension