X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Favatar%2Favatar.ts;h=5d73e24fae4078b814d3e92ed6338b8156e36361;hb=8704acf49efc770d73bf07c10468ed8c74d28a83;hp=7493c3d75f57dc85c509b558f7f6bf1684c392a0;hpb=c5911fd347c76e8bdc05ea9f3ee9efed4a58c236;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/avatar/avatar.ts b/server/models/avatar/avatar.ts index 7493c3d75..5d73e24fa 100644 --- a/server/models/avatar/avatar.ts +++ b/server/models/avatar/avatar.ts @@ -1,10 +1,9 @@ import { join } from 'path' import { AfterDestroy, AllowNull, Column, CreatedAt, Model, Table, UpdatedAt } from 'sequelize-typescript' import { Avatar } from '../../../shared/models/avatars/avatar.model' -import { unlinkPromise } from '../../helpers/core-utils' -import { logger } from '../../helpers/logger' import { CONFIG, STATIC_PATHS } from '../../initializers' -import { sendDeleteVideo } from '../../lib/activitypub/send' +import { logger } from '../../helpers/logger' +import { remove } from 'fs-extra' @Table({ tableName: 'avatar' @@ -23,6 +22,7 @@ export class AvatarModel extends Model { @AfterDestroy static removeFilesAndSendDelete (instance: AvatarModel) { + logger.info('Removing avatar file %s.', instance.filename) return instance.removeAvatar() } @@ -40,6 +40,6 @@ export class AvatarModel extends Model { removeAvatar () { const avatarPath = join(CONFIG.STORAGE.AVATARS_DIR, this.filename) - return unlinkPromise(avatarPath) + return remove(avatarPath) } }