import 'multer'
import { sendUpdateActor } from './activitypub/send'
import { AVATARS_SIZE, LRU_CACHE, QUEUE_CONCURRENCY } from '../initializers/constants'
-import { updateActorAvatarInstance } from './activitypub/actor'
+import { updateActorAvatarInstance, deleteActorAvatarInstance } from './activitypub/actor'
import { processImage } from '../helpers/image-utils'
import { extname, join } from 'path'
import { retryTransactionWrapper } from '../helpers/database-utils'
import { downloadImage } from '../helpers/requests'
import { MAccountDefault, MChannelDefault } from '../types/models'
-async function updateActorAvatarFile (
- avatarPhysicalFile: Express.Multer.File,
- accountOrChannel: MAccountDefault | MChannelDefault
+async function updateLocalActorAvatarFile (
+ accountOrChannel: MAccountDefault | MChannelDefault,
+ avatarPhysicalFile: Express.Multer.File
) {
const extension = extname(avatarPhysicalFile.filename)
+
const avatarName = uuidv4() + extension
const destination = join(CONFIG.STORAGE.AVATARS_DIR, avatarName)
await processImage(avatarPhysicalFile.path, destination, AVATARS_SIZE)
})
}
+async function deleteLocalActorAvatarFile (
+ 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) => {
}, QUEUE_CONCURRENCY.AVATAR_PROCESS_IMAGE)
function pushAvatarProcessInQueue (task: DownloadImageQueueTask) {
- return new Promise((res, rej) => {
+ return new Promise<void>((res, rej) => {
downloadImageQueue.push(task, err => {
if (err) return rej(err)
export {
avatarPathUnsafeCache,
- updateActorAvatarFile,
+ updateLocalActorAvatarFile,
+ deleteLocalActorAvatarFile,
pushAvatarProcessInQueue
}