matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-12-01 09:58:03 +03:00
Code Activity

Handle encrypted stickers and store stickers in a separate folder

Browse Source
This commit is contained in:
Jaiwanth
2021-06-02 12:06:00 +05:30
parent c63c59b408
commit 692e499cf2
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/exportUtils/HtmlExport.tsx
View File

@@ -156,7 +156,9 @@ export default class HTMLExporter extends Exporter {
try {
const isEncrypted = event.isEncrypted();
const content = event.getContent();
if (isEncrypted && !content.hasOwnProperty("org.matrix.msc1767.file")) {
const shouldDecrypt = isEncrypted && !content.hasOwnProperty("org.matrix.msc1767.file")
&& event.getType() !== "m.sticker";
if (shouldDecrypt) {
blob = await decryptFile(content.file);
} else {
const media = mediaFromContent(event.getContent());
@@ -185,7 +187,7 @@ export default class HTMLExporter extends Exporter {
if (lastDot === -1) return [file, ""];
const fileName = file.slice(0, lastDot);
const ext = file.slice(lastDot + 1);
return [fileName, ext];
return [fileName, '.' + ext];
}
protected getFilePath(event: MatrixEvent) {
@@ -202,12 +204,11 @@ export default class HTMLExporter extends Exporter {
fileDirectory = "audio";
break;
default:
fileDirectory = "files";
break;
fileDirectory = event.getType() === "m.sticker" ? "stickers" : "files";
}
const fileDate = formatFullDateNoDay(new Date(event.getTs()));
const [fileName, fileExt] = this.splitFileName(event.getContent().body);
const filePath = fileDirectory + "/" + fileName + '-' + fileDate + '.' + fileExt;
const filePath = fileDirectory + "/" + fileName + '-' + fileDate + fileExt;
return filePath;
}