PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Assign replacements

Browse source
This commit is contained in:
Jaiwanth 2021-08-04 12:39:35 +05:30
parent e29d9db2e7
commit c74d6c6fff
3 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/utils/exportUtils/HtmlExport.tsx
View file

@ -36,6 +36,7 @@ import { ExportTypes } from "./exportUtils";
import { IExportOptions } from "./exportUtils"; import { IExportOptions } from "./exportUtils";
import MatrixClientContext from "../../contexts/MatrixClientContext"; import MatrixClientContext from "../../contexts/MatrixClientContext";
import getExportCSS from "./exportCSS"; import getExportCSS from "./exportCSS";
import { textForEvent } from "../../TextForEvent";
export default class HTMLExporter extends Exporter { export default class HTMLExporter extends Exporter {
protected avatars: Map<string, boolean>; protected avatars: Map<string, boolean>;
@ -346,13 +347,16 @@ export default class HTMLExporter extends Exporter {
); );
} }
} else { } else {
eventTile = await this.getEventTileMarkup(this.createModifiedEvent(this.mediaOmitText, mxEv), joined); eventTile = await this.getEventTileMarkup(
this.createModifiedEvent(this.mediaOmitText, mxEv),
joined,
);
} }
} else eventTile = await this.getEventTileMarkup(mxEv, joined); } else eventTile = await this.getEventTileMarkup(mxEv, joined);
} catch (e) { } catch (e) {
// TODO: Handle callEvent errors // TODO: Handle callEvent errors
console.error(e); console.error(e);
eventTile = await this.getEventTileMarkup(this.createModifiedEvent("Error parsing HTML", mxEv), joined); eventTile = await this.getEventTileMarkup(this.createModifiedEvent(textForEvent(mxEv), mxEv), joined);
} }
return eventTile; return eventTile;

8
src/utils/exportUtils/exportCSS.ts
View file

@ -20,6 +20,7 @@ import ThemeWatcher from "../../settings/watchers/ThemeWatcher";
const getExportCSS = async (): Promise<string> => { const getExportCSS = async (): Promise<string> => {
const theme = new ThemeWatcher().getEffectiveTheme(); const theme = new ThemeWatcher().getEffectiveTheme();
// eslint-disable-next-line camelcase
const hash = __webpack_hash__; const hash = __webpack_hash__;
const bundle = await fetch(`bundles/${hash}/bundle.css`); const bundle = await fetch(`bundles/${hash}/bundle.css`);
const bundleCSS = await bundle.text(); const bundleCSS = await bundle.text();
@ -32,13 +33,14 @@ const getExportCSS = async (): Promise<string> => {
themeCSS = await res.text(); themeCSS = await res.text();
} }
const fontFaceRegex = /@font-face {.*?}/sg; const fontFaceRegex = /@font-face {.*?}/sg;
themeCSS.replace(fontFaceRegex, '');
themeCSS.replace( themeCSS = themeCSS.replace(fontFaceRegex, '');
themeCSS = themeCSS.replace(
/font-family: Inter/g, /font-family: Inter/g,
`font-family: -apple-system, BlinkMacSystemFont, avenir next, `font-family: -apple-system, BlinkMacSystemFont, avenir next,
avenir, segoe ui, helvetica neue, helvetica, Ubuntu, roboto, noto, arial, sans-serif`, avenir, segoe ui, helvetica neue, helvetica, Ubuntu, roboto, noto, arial, sans-serif`,
); );
themeCSS.replace( themeCSS = themeCSS.replace(
/font-family: Inconsolata/g, /font-family: Inconsolata/g,
"font-family: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace", "font-family: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace",
); );

30
test/utils/export-test.tsx
View file

@ -37,6 +37,12 @@ describe('export', function() {
return MY_USER_ID; return MY_USER_ID;
}; };
const mockExportOptions: IExportOptions = {
numberOfMessages: 5,
maxSize: 100 * 1024 * 1024,
attachmentsIncluded: false,
};
const invalidExportOptions: IExportOptions[] = [ const invalidExportOptions: IExportOptions[] = [
{ {
numberOfMessages: 10**9, numberOfMessages: 10**9,
@ -97,5 +103,29 @@ describe('export', function() {
} }
} }
}); });
it('tests the file extension splitter', function() {
const exporter = new PlainTextExporter(room, ExportTypes.BEGINNING, mockExportOptions, null);
const fileNameWithExtensions = {
"": ["", ""],
"name": ["name", ""],
"name.txt": ["name", ".txt"],
".htpasswd": ["", ".htpasswd"],
"name.with.many.dots.myext": ["name.with.many.dots", ".myext"],
};
for (const fileName in fileNameWithExtensions) {
expect(exporter.splitFileName(fileName)).toStrictEqual(fileNameWithExtensions[fileName]);
}
});
// it('checks if the reply regex executes correctly', function() {
// const eventContents = [
// {
// "msgtype": "m.text",
// "body": "> <@me:here> Testing....\n\nTest",
// "expectedText": "",
// },
// ];
// });
}); });