Fix avatar url validation

[github/Chocobozzz/PeerTube.git] / server / models / video / thumbnail.ts

diff --git a/server/models/video/thumbnail.ts b/server/models/video/thumbnail.ts
index baa5533ac424fd00a2ca793515802608be6164dc..cf2040cbf6416225432d005fe5a31c0201f0ac47 100644 (file)
--- a/server/models/video/thumbnail.ts
+++ b/server/models/video/thumbnail.ts
@@ -1,6 +1,6 @@
 import { join } from 'path'
 import { AfterDestroy, AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
-import { STATIC_PATHS, WEBSERVER } from '../../initializers/constants'
+import { LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants'
 import { logger } from '../../helpers/logger'
 import { remove } from 'fs-extra'
 import { CONFIG } from '../../initializers/config'
@@ -42,7 +42,11 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
 
   @AllowNull(true)
   @Column
-  url: string
+  fileUrl: string
+
+  @AllowNull(true)
+  @Column
+  automaticallyGenerated: boolean
 
   @ForeignKey(() => VideoModel)
   @Column
@@ -75,20 +79,20 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
   updatedAt: Date
 
   private static types: { [ id in ThumbnailType ]: { label: string, directory: string, staticPath: string } } = {
-    [ThumbnailType.THUMBNAIL]: {
-      label: 'thumbnail',
+    [ThumbnailType.MINIATURE]: {
+      label: 'miniature',
       directory: CONFIG.STORAGE.THUMBNAILS_DIR,
       staticPath: STATIC_PATHS.THUMBNAILS
     },
     [ThumbnailType.PREVIEW]: {
       label: 'preview',
       directory: CONFIG.STORAGE.PREVIEWS_DIR,
-      staticPath: STATIC_PATHS.PREVIEWS
+      staticPath: LAZY_STATIC_PATHS.PREVIEWS
     }
   }
 
   @AfterDestroy
-  static removeFilesAndSendDelete (instance: ThumbnailModel) {
+  static removeFiles (instance: ThumbnailModel) {
     logger.info('Removing %s file %s.', ThumbnailModel.types[instance.type].label, instance.filename)
 
     // Don't block the transaction
@@ -100,17 +104,19 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
     return videoUUID + '.jpg'
   }
 
-  getUrl () {
-    if (this.url) return this.url
+  getFileUrl () {
+    if (this.fileUrl) return this.fileUrl
 
     const staticPath = ThumbnailModel.types[this.type].staticPath
     return WEBSERVER.URL + staticPath + this.filename
   }
 
-  removeThumbnail () {
+  getPath () {
     const directory = ThumbnailModel.types[this.type].directory
-    const thumbnailPath = join(directory, this.filename)
+    return join(directory, this.filename)
+  }
 
-    return remove(thumbnailPath)
+  removeThumbnail () {
+    return remove(this.getPath())
   }
 }