mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 18:11:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove avatarForExport string

Browse source
This commit is contained in:
Jaiwanth 2021-06-26 23:40:35 +05:30
parent 55ffb318e5
commit 685441baf5
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,8 +67,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.member.getMxcAvatarUrl()) {
else if (props.member.getMxcAvatarUrl()) {
imageUrl = mediaFromMxc(props.member.getMxcAvatarUrl()).getThumbnailOfSourceHttp( imageUrl = mediaFromMxc(props.member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
props.width, props.width,
props.height, props.height,

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

@ -190,19 +190,26 @@ export default class HTMLExporter extends Exporter {
</html>` </html>`
} }
protected hasAvatar(event: MatrixEvent): boolean { protected getAvatarURL(event: MatrixEvent): string {
const member = event.sender; const member = event.sender;
return !!member.getMxcAvatarUrl(); return (
member.getMxcAvatarUrl() &&
mediaFromMxc(member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(
30,
30,
"crop",
)
);
} }
protected async saveAvatarIfNeeded(event: MatrixEvent) { protected async saveAvatarIfNeeded(event: MatrixEvent) {
const member = event.sender; const member = event.sender;
const avatarUrl = mediaFromMxc(member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(30, 30, "crop");
if (!this.avatars.has(member.userId)) { if (!this.avatars.has(member.userId)) {
const avatarUrl = this.getAvatarURL(event);
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.addFile(`users/${member.userId.replace(/:/g, '-')}`, blob); this.addFile(`users/${member.userId.replace(/:/g, '-')}.png`, blob);
} }
} }
@ -218,7 +225,7 @@ export default class HTMLExporter extends Exporter {
} }
protected async getEventTile(mxEv: MatrixEvent, continuation: boolean, filePath?: string) { protected async getEventTile(mxEv: MatrixEvent, continuation: boolean, filePath?: string) {
const hasAvatar = this.hasAvatar(mxEv); const hasAvatar = !!this.getAvatarURL(mxEv);
if (hasAvatar) await this.saveAvatarIfNeeded(mxEv); if (hasAvatar) await this.saveAvatarIfNeeded(mxEv);
const eventTile = <div className="mx_Export_EventWrapper" id={mxEv.getId()}> const eventTile = <div className="mx_Export_EventWrapper" id={mxEv.getId()}>
@ -251,8 +258,8 @@ export default class HTMLExporter extends Exporter {
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( eventTileMarkup = eventTileMarkup.replace(
/src="avatarForExport"/g, encodeURI(this.getAvatarURL(mxEv)).replace(/&/g, '&amp;'),
`src="users/${mxEv.sender.userId.replace(/:/g, "-")}"`, `users/${mxEv.sender.userId.replace(/:/g, "-")}.png`,
); );
} }
return eventTileMarkup; return eventTileMarkup;