X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Favatar.ts;h=be6657b6ffbe1c780c0d2f9411a5f36f7fa02307;hb=6bff8ce23ac9a2de8c6ddcea9df5f7bd2b653156;hp=9005b3e225e1270fe696f24149784421cb87b12f;hpb=453e83ea5d81d203ba34bc43cd5c2c750ba40568;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/avatar.ts b/server/lib/avatar.ts index 9005b3e22..be6657b6f 100644 --- a/server/lib/avatar.ts +++ b/server/lib/avatar.ts @@ -1,21 +1,21 @@ import 'multer' import { sendUpdateActor } from './activitypub/send' import { AVATARS_SIZE, LRU_CACHE, QUEUE_CONCURRENCY } from '../initializers/constants' -import { updateActorAvatarInstance } from './activitypub' +import { updateActorAvatarInstance } from './activitypub/actor' 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 '../types/models' async function updateActorAvatarFile ( avatarPhysicalFile: Express.Multer.File, - accountOrChannel: MAccountActorDefault | MChannelActorDefault + accountOrChannel: MAccountDefault | MChannelDefault ) { const extension = extname(avatarPhysicalFile.filename) const avatarName = uuidv4() + extension