Fix AP collections pagination

[github/Chocobozzz/PeerTube.git] / server / models / avatar / avatar.ts

diff --git a/server/models/avatar/avatar.ts b/server/models/avatar/avatar.ts
index 7493c3d75f57dc85c509b558f7f6bf1684c392a0..303aebcc2cc0919f7296e824ad958cc081b0780d 100644 (file)
--- 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,7 +22,11 @@ export class AvatarModel extends Model<AvatarModel> {
 
   @AfterDestroy
   static removeFilesAndSendDelete (instance: AvatarModel) {
-    return instance.removeAvatar()
+    logger.info('Removing avatar file %s.', instance.filename)
+
+    // Don't block the transaction
+    instance.removeAvatar()
+      .catch(err => logger.error('Cannot remove avatar file %s.', instance.filename, err))
   }
 
   toFormattedJSON (): Avatar {
@@ -40,6 +43,6 @@ export class AvatarModel extends Model<AvatarModel> {
 
   removeAvatar () {
     const avatarPath = join(CONFIG.STORAGE.AVATARS_DIR, this.filename)
-    return unlinkPromise(avatarPath)
+    return remove(avatarPath)
   }
 }