Merge remote-tracking branch 'weblate/develop' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / uploadx.ts

diff --git a/server/lib/uploadx.ts b/server/lib/uploadx.ts
index 58040cb6d679d5c1adf613242bec5c2ffa4526e9..c7e0eb414e8e501dd8f90d2e6722fd85e46cde2b 100644 (file)
--- a/server/lib/uploadx.ts
+++ b/server/lib/uploadx.ts
@@ -3,6 +3,7 @@ import { buildLogger } from '@server/helpers/logger'
 import { getResumableUploadPath } from '@server/helpers/upload'
 import { CONFIG } from '@server/initializers/config'
 import { LogLevel, Uploadx } from '@uploadx/core'
+import { extname } from 'path'
 
 const logger = buildLogger('uploadx')
 
@@ -26,7 +27,9 @@ const uploadx = new Uploadx({
     if (!res.locals.oauth) return undefined
 
     return res.locals.oauth.token.user.id + ''
-  }
+  },
+
+  filename: file => `${file.userId}-${file.id}${extname(file.metadata.filename)}`
 })
 
 export {