X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Favatar.ts;h=09b4e38ca10210016cfb212d47a4968c5fb3135a;hb=c5407d7046168abb4098df1408e7aa84519cb61a;hp=14f0a05f58829f5d93a175c2e616392ce9cde1ec;hpb=f201a749929ec8094a7ba6bcab7b196870ca5a5e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/avatar.ts b/server/lib/avatar.ts
index 14f0a05f5..09b4e38ca 100644
--- a/server/lib/avatar.ts
+++ b/server/lib/avatar.ts
@@ -1,25 +1,31 @@
 import 'multer'
 import { sendUpdateActor } from './activitypub/send'
-import { AVATARS_SIZE, CONFIG, 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'
 import { VideoChannelModel } from '../models/video/video-channel'
 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 = accountOrChannel.Actor.uuid + extension
+  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 sequelizeTypescript.transaction(async t => {
-    const updatedActor = await updateActorAvatarInstance(accountOrChannel.Actor, avatarName, t)
-    await updatedActor.save({ transaction: t })
+  return retryTransactionWrapper(() => {
+    return sequelizeTypescript.transaction(async t => {
+      const updatedActor = await updateActorAvatarInstance(accountOrChannel.Actor, avatarName, t)
+      await updatedActor.save({ transaction: t })
 
-    await sendUpdateActor(accountOrChannel, t)
+      await sendUpdateActor(accountOrChannel, t)
 
-    return updatedActor.Avatar
+      return updatedActor.Avatar
+    })
   })
 }