imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into sort-imports

Browse source 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
Aaron Raimist 2021-12-09 08:34:20 +00:00
commit 7b94e13a84
642 changed files with 30052 additions and 8035 deletions
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> {
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 zip = new JSZip();
@ -85,7 +86,7 @@ export default abstract class Exporter {
if (!this.cancelled) this.updateProgress("Generating a ZIP");
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" });