import 'multer'
import { sendUpdateActor } from './activitypub/send'
import { AVATARS_SIZE, LRU_CACHE, QUEUE_CONCURRENCY } from '../initializers/constants'
-import { updateActorAvatarInstance } from './activitypub'
+import { updateActorAvatarInstance, deleteActorAvatarInstance } 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,
+ avatarPhysicalFile: Express.Multer.File
) {
const extension = extname(avatarPhysicalFile.filename)
const avatarName = uuidv4() + extension
})
}
+async function deleteActorAvatarFile (
+ accountOrChannel: MAccountDefault | MChannelDefault
+) {
+ return retryTransactionWrapper(() => {
+ return sequelizeTypescript.transaction(async t => {
+ const updatedActor = await deleteActorAvatarInstance(accountOrChannel.Actor, t)
+ await updatedActor.save({ transaction: t })
+
+ await sendUpdateActor(accountOrChannel, t)
+
+ return updatedActor.Avatar
+ })
+ })
+}
+
type DownloadImageQueueTask = { fileUrl: string, filename: string }
const downloadImageQueue = queue<DownloadImageQueueTask, Error>((task, cb) => {
export {
avatarPathUnsafeCache,
updateActorAvatarFile,
+ deleteActorAvatarFile,
pushAvatarProcessInQueue
}