OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Add root folder to zip file created by export chat feature (#7097) 

Signed-off-by: Aaron Raimist <aaron@raim.ist>
pull/21833/head
Aaron R 2021-11-15 15:37:16 -06:00 committed by GitHub
parent bafeb38472
commit 6d79b95876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/exportUtils/Exporter.ts
View File

@ -77,7 +77,8 @@ export default abstract class Exporter {
protected async downloadZIP(): Promise<string | void> { protected async downloadZIP(): Promise<string | void> {
const brand = SdkConfig.get().brand; const brand = SdkConfig.get().brand;
const filename = `${brand} - Chat Export - ${formatFullDateNoDay(new Date())}.zip`; const filenameWithoutExt = `${brand} - Chat Export - ${formatFullDateNoDay(new Date())}`;
const filename = `${filenameWithoutExt}.zip`;
const { default: JSZip } = await import('jszip'); const { default: JSZip } = await import('jszip');
const zip = new JSZip(); const zip = new JSZip();
@ -85,7 +86,7 @@ export default abstract class Exporter {
if (!this.cancelled) this.updateProgress("Generating a ZIP"); if (!this.cancelled) this.updateProgress("Generating a ZIP");
else return this.cleanUp(); else return this.cleanUp();
for (const file of this.files) zip.file(file.name, file.blob); for (const file of this.files) zip.file(filenameWithoutExt + "/" + file.name, file.blob);
const content = await zip.generateAsync({ type: "blob" }); const content = await zip.generateAsync({ type: "blob" });