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

Modify local avatar's url to not contain colons

Browse source
This commit is contained in:
Jaiwanth 2021-06-21 11:43:47 +05:30
parent 9e6b8ff9f5
commit 44f458d577
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/avatars/MemberAvatar.tsx
View file

@ -68,7 +68,7 @@ export default class MemberAvatar extends React.Component<IProps, IState> {
private static getState(props: IProps): IState { private static getState(props: IProps): IState {
if (props.member?.name) { if (props.member?.name) {
let imageUrl = null; let imageUrl = null;
if (props.forExport && props.member.getMxcAvatarUrl()) imageUrl = "AvatarForExport"; if (props.forExport && props.member.getMxcAvatarUrl()) imageUrl = "avatarForExport";
else if (props.member.getMxcAvatarUrl()) { else if (props.member.getMxcAvatarUrl()) {
imageUrl = mediaFromMxc(props.member.getMxcAvatarUrl()).getThumbnailOfSourceHttp( imageUrl = mediaFromMxc(props.member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
props.width, props.width,

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

@ -217,7 +217,7 @@ export default class HTMLExporter extends Exporter {
this.avatars.set(member.userId, true); this.avatars.set(member.userId, true);
const image = await fetch(avatarUrl); const image = await fetch(avatarUrl);
const blob = await image.blob(); const blob = await image.blob();
this.zip.file(`users/${member.userId}`, blob); this.zip.file(`users/${member.userId.replace(/:/g, '-')}`, blob);
} }
} }
@ -265,7 +265,10 @@ export default class HTMLExporter extends Exporter {
let eventTileMarkup = renderToStaticMarkup(eventTile); let eventTileMarkup = renderToStaticMarkup(eventTile);
if (filePath) eventTileMarkup = eventTileMarkup.replace(/(src=|href=)"forExport"/g, `$1"${filePath}"`); if (filePath) eventTileMarkup = eventTileMarkup.replace(/(src=|href=)"forExport"/g, `$1"${filePath}"`);
if (hasAvatar) { if (hasAvatar) {
eventTileMarkup = eventTileMarkup.replace(/src="AvatarForExport"/g, `src="users/${mxEv.sender.userId}"`); eventTileMarkup = eventTileMarkup.replace(
/src="avatarForExport"/g,
`src="users/${mxEv.sender.userId.replace(/:/g, "-")}"`,
);
} }
return eventTileMarkup; return eventTileMarkup;
} }
@ -291,8 +294,8 @@ export default class HTMLExporter extends Exporter {
formatted_body: `<strong>${this.mediaOmitText}</strong>`, formatted_body: `<strong>${this.mediaOmitText}</strong>`,
} }
if (mxEv.isEncrypted()) { if (mxEv.isEncrypted()) {
mxEv._clearEvent.content = modifiedContent; mxEv.clearEvent.content = modifiedContent;
mxEv._clearEvent.type = "m.room.message"; mxEv.clearEvent.type = "m.room.message";
} else { } else {
mxEv.event.content = modifiedContent; mxEv.event.content = modifiedContent;
mxEv.event.type = "m.room.message"; mxEv.event.type = "m.room.message";