More robust actor image lazy load

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

diff --git a/server/models/actor/actor.ts b/server/models/actor/actor.ts
index 65c53f8f8a01f49decd5ff0b5ae855395da75388..0cd30f5451ad693ea8d65746c5db0b5cee4d22ab 100644 (file)
--- a/server/models/actor/actor.ts
+++ b/server/models/actor/actor.ts
@@ -1,5 +1,4 @@
 import { values } from 'lodash'
-import { extname } from 'path'
 import { literal, Op, Transaction } from 'sequelize'
 import {
   AllowNull,
@@ -17,6 +16,7 @@ import {
   Table,
   UpdatedAt
 } from 'sequelize-typescript'
+import { getLowercaseExtension } from '@server/helpers/core-utils'
 import { ModelCache } from '@server/models/model-cache'
 import { AttributesOnly } from '@shared/core-utils'
 import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub'
@@ -567,7 +567,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
     let image: ActivityIconObject
 
     if (this.avatarId) {
-      const extension = extname(this.Avatar.filename)
+      const extension = getLowercaseExtension(this.Avatar.filename)
 
       icon = {
         type: 'Image',
@@ -580,7 +580,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
 
     if (this.bannerId) {
       const banner = (this as MActorAPChannel).Banner
-      const extension = extname(banner.filename)
+      const extension = getLowercaseExtension(banner.filename)
 
       image = {
         type: 'Image',