Move test functions outside extra-utils

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / actors / shared / object-to-model-attributes.ts

diff --git a/server/lib/activitypub/actors/shared/object-to-model-attributes.ts b/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
index 66b22c9525372e0e7fc6916974bfcb64fcdf3966..38d93c1085190f4db6cbd0dbcb2b6e5415572516 100644 (file)
--- a/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
+++ b/server/lib/activitypub/actors/shared/object-to-model-attributes.ts
@@ -1,9 +1,8 @@
-import { extname } from 'path'
-import { v4 as uuidv4 } from 'uuid'
 import { isActivityPubUrlValid } from '@server/helpers/custom-validators/activitypub/misc'
 import { MIMETYPES } from '@server/initializers/constants'
 import { ActorModel } from '@server/models/actor/actor'
 import { FilteredModelAttributes } from '@server/types'
+import { buildUUID, getLowercaseExtension } from '@shared/core-utils'
 import { ActivityPubActor, ActorImageType } from '@shared/models'
 
 function getActorAttributesFromObject (
@@ -43,7 +42,7 @@ function getImageInfoFromObject (actorObject: ActivityPubActor, type: ActorImage
   if (icon.mediaType) {
     extension = mimetypes.MIMETYPE_EXT[icon.mediaType]
   } else {
-    const tmp = extname(icon.url)
+    const tmp = getLowercaseExtension(icon.url)
 
     if (mimetypes.EXT_MIMETYPE[tmp] !== undefined) extension = tmp
   }
@@ -51,7 +50,7 @@ function getImageInfoFromObject (actorObject: ActivityPubActor, type: ActorImage
   if (!extension) return undefined
 
   return {
-    name: uuidv4() + extension,
+    name: buildUUID() + extension,
     fileUrl: icon.url,
     height: icon.height,
     width: icon.width,