interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix user export expiration

This commit is contained in:
Chocobozzz 2024-12-16 07:11:30 +01:00
parent aac9ff8931
commit ae3b487c42
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/tests/src/api/users/user-export.ts
View File

@ -852,6 +852,7 @@ function runTest (withObjectStorage: boolean) {
await server.userExports.request({ userId: noahId, withVideoFiles: true })
await server.userExports.waitForCreation({ userId: noahId })
await wait(1500)
const tomorrow = new Date()
tomorrow.setDate(tomorrow.getDate() + 1)
@ -866,6 +867,13 @@ function runTest (withObjectStorage: boolean) {
await checkExportFileExists({ exists: true, server, userExport, withObjectStorage, redirectedUrl })
// Should not delete the file
await server.debug.sendCommand({ body: { command: 'remove-expired-user-exports' } })
// File deletion
await wait(500)
await checkExportFileExists({ exists: true, server, userExport, withObjectStorage, redirectedUrl })
await server.config.updateExistingConfig({
newConfig: {
export: {
@ -876,11 +884,7 @@ function runTest (withObjectStorage: boolean) {
}
})
await server.debug.sendCommand({
body: {
command: 'remove-expired-user-exports'
}
})
await server.debug.sendCommand({ body: { command: 'remove-expired-user-exports' } })
// File deletion
await wait(500)

2
server/core/models/user/user-export.ts
View File

@ -109,7 +109,7 @@ export class UserExportModel extends SequelizeModel<UserExportModel> {
const query: FindOptions = {
where: {
createdAt: {
[Op.lt]: new Date(new Date().getTime() + expirationTimeMS)
[Op.lt]: new Date(new Date().getTime() - expirationTimeMS)
}
}
}